From patchwork Sat May 29 21:34:42 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: 103094 Received: from mx01.colomx.prod.int.phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4TLbi9g018550 for ; Sat, 29 May 2010 21:38:21 GMT Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx01.colomx.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4TLYvoI011296; Sat, 29 May 2010 17:35:04 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4TLYuv4016643 for ; Sat, 29 May 2010 17:34:56 -0400 Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com [10.5.110.14]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4TLYphi014542 for ; Sat, 29 May 2010 17:34:51 -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 o4TLYgwG013337 for ; Sat, 29 May 2010 17:34:42 -0400 Received: (qmail 29768 invoked by uid 9737); 29 May 2010 21:34:42 -0000 Date: 29 May 2010 21:34:42 -0000 Message-ID: <20100529213442.29766.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.16 X-Scanned-By: MIMEDefang 2.67 on 10.5.110.14 X-loop: dm-devel@redhat.com Subject: [dm-devel] dmraid lib/Makefile.in ./make.tmpl.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]); Sat, 29 May 2010 21:38:21 +0000 (UTC) --- dmraid/lib/Makefile.in 2010/05/28 12:35:01 1.12 +++ dmraid/lib/Makefile.in 2010/05/29 21:34:41 1.13 @@ -73,10 +73,16 @@ all: $(TARGETS) +# FIXME Use major version for -soname +$(LIB_SHARED): $(OBJECTS) $(top_srcdir)/lib/.export.sym + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS) \ + -shared -Wl,-soname,$(notdir $@).1 \ + -Wl,--version-script,$(top_srcdir)/lib/.export.sym \ + -ldevmapper-event + $(LIB_EVENTS_SHARED): $(OBJECTS2) - $(CC) -o $@ $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(OBJECTS2) \ - -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_VERSION) \ - $(LIB_SHARED) -ldevmapper-event -lpthread + $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS2) \ + -shared -Wl,-soname,$(notdir $@) -ldevmapper-event -lpthread .PHONY: $(addprefix install_,$(TARGETS)) $(addprefix remove_,$(TARGETS)) --- dmraid/make.tmpl.in 2010/05/28 12:31:39 1.9 +++ dmraid/make.tmpl.in 2010/05/29 21:34:41 1.10 @@ -130,8 +130,8 @@ $(TARGETS): $(OBJECTS) -%.o: %.c - $(CC) -c $(INCLUDES) $(CFLAGS) $< -o $@ +%.o: %.c $(top_builddir)/include/config.h + $(CC) -o $@ -c $(INCLUDES) $(CFLAGS) -include $(top_builddir)/include/config.h $< %.d: %.c $(MKDIR_P) $(dir $@); \ @@ -142,12 +142,6 @@ sed -i "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" $@; \ [ -s $@ ] || $(RM) $@ -%.so: $(OBJECTS) $(top_srcdir)/lib/.export.sym - -%.so: $(OBJECTS) - $(CC) -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_VERSION) \ - -Wl,--version-script,$(top_srcdir)/lib/.export.sym $(OBJECTS) -o $@ -ldevmapper-event - $(LIB_STATIC): $(OBJECTS) $(RM) $@ $(AR) r $@ $(OBJECTS)