From patchwork Thu May 27 19:50:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zkabelac@sourceware.org X-Patchwork-Id: 102764 Received: from mx02.colomx.prod.int.phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4RJqoee018616 for ; Thu, 27 May 2010 19:53:25 GMT Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx02.colomx.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4RJonGI031629; Thu, 27 May 2010 15:50:50 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4RJoi1W031475 for ; Thu, 27 May 2010 15:50:44 -0400 Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.12]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4RJocKE016901 for ; Thu, 27 May 2010 15:50:39 -0400 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by mx1.redhat.com (8.13.8/8.13.8) with SMTP id o4RJoTk0004953 for ; Thu, 27 May 2010 15:50:29 -0400 Received: (qmail 22240 invoked by uid 9737); 27 May 2010 19:50:28 -0000 Date: 27 May 2010 19:50:28 -0000 Message-ID: <20100527195028.22238.qmail@sourceware.org> From: zkabelac@sourceware.org To: dm-cvs@sourceware.org, dm-devel@redhat.com X-RedHat-Spam-Score: -2.31 (RCVD_IN_DNSWL_MED,T_RP_MATCHES_RCVD) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-Scanned-By: MIMEDefang 2.67 on 10.5.110.12 X-loop: dm-devel@redhat.com Subject: [dm-devel] dmraid/tools Makefile.in X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 27 May 2010 19:53:25 +0000 (UTC) --- dmraid/tools/Makefile.in 2010/05/27 14:28:48 1.8 +++ dmraid/tools/Makefile.in 2010/05/27 19:50:28 1.9 @@ -1,5 +1,5 @@ # -# Copyright (C) 2004-2005 Heinz Mauelshagen, Red Hat GmbH. All rights reserved. +# Copyright (C) 2004-2010 Heinz Mauelshagen, Red Hat GmbH. All rights reserved. # # See file LICENSE at the top of this source tree for license information. # @@ -9,9 +9,9 @@ top_builddir = @top_builddir@ VPATH = @srcdir@ DIETLIBC = @DIETLIBC@ -KIBC = @KLIBC@ +KLIBC = @KLIBC@ -INCLUDES += -I $(src_dir) +INCLUDES += -I$(src_dir) SOURCES=\ dmraid.c \ @@ -21,7 +21,7 @@ TARGETS=\ dmraid -include $(top_srcdir)/make.tmpl +include $(top_builddir)/make.tmpl ifeq ("@KLIBC@", "no") ifeq ("@STATIC_LINK@", "no") @@ -29,7 +29,7 @@ endif endif -DMRAIDLIBS=-ldmraid -lpthread +DMRAIDLIBS=-ldmraid # FIXME: use pkg-config here to get the list of needed librarie # pkg-config --libs devmapper @@ -61,25 +61,21 @@ endif endif -# Dynamic linker library -LIBS += -ldl - all: $(TARGETS) .PHONY: install_dmraid_tools remove_dmraid_tools dmraid: $(OBJECTS) $(top_builddir)/lib/libdmraid.a - $(CC) -o $@ $(OBJECTS) $(LDFLAGS) -L$(top_srcdir)/lib \ - -L$(DESTDIR)$(libdir) $(DMRAIDLIBS) $(DMEVENTTOOLLIBS) $(DMRAIDLIBS) $(LIBS) + $(CC) -o $@ $(OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(DMRAIDLIBS) $(LIBS) -dmevent_tool: $(top_srcdir)/lib/libdmraid.a - $(CC) -o $@ $@.c $(INCLUDES) $(LDFLAGS) -L$(top_srcdir)/lib \ - -L$(DESTDIR)$(libdir) $(DMRAIDLIBS) $(DMEVENTTOOLLIBS) $(DMRAIDLIBS) $(LIBS) +dmevent_tool: $(top_builddir)/lib/libdmraid.a + $(CC) -o $@ $@.c $(INCLUDES) $(LDFLAGS) -L$(top_builddir)/lib \ + $(DMRAIDLIBS) $(DMEVENTTOOLLIBS) $(LIBS) install_dmraid_tools: $(TARGETS) @echo "Installing $(TARGETS) in $(DESTDIR)$(sbindir)"; \ - mkdir -p $(DESTDIR)$(sbindir); \ - $(INSTALL) $(STRIP) $(TARGETS) $(DESTDIR)$(sbindir) + $(INSTALL_DIR) $(DESTDIR)$(sbindir); \ + $(INSTALL_PROGRAM) $(TARGETS) $(DESTDIR)$(sbindir) install: install_dmraid_tools