From: zkabelac@sourceware.org
To: dm-cvs@sourceware.org, dm-devel@redhat.com
Subject: dmraid/lib Makefile.in
Date: 30 May 2010 17:41:22 -0000 [thread overview]
Message-ID: <20100530174122.31782.qmail@sourceware.org> (raw)
CVSROOT: /cvs/dm
Module name: dmraid
Changes by: zkabelac@sourceware.org 2010-05-30 17:41:22
Modified files:
lib : Makefile.in
Log message:
Remove full path for current build dir for LIB_STATIC LIB_SHARED
Calculate DMRAID_LIB_VERSION from vars generated by configure.in (following patch)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/lib/Makefile.in.diff?cvsroot=dm&r1=1.13&r2=1.14
--- dmraid/lib/Makefile.in 2010/05/29 21:34:41 1.13
+++ dmraid/lib/Makefile.in 2010/05/30 17:41:22 1.14
@@ -54,7 +54,7 @@
SOURCES2 = events/$(LIB_EVENTS_NAME).c
-LIB_STATIC = $(top_builddir)/lib/libdmraid.a
+LIB_STATIC = libdmraid.a
LIB_EVENTS_NAME = libdmraid-events-isw
USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \
$(AWK) -f $(top_srcdir)/tools/relpath.awk)
@@ -65,7 +65,7 @@
ifeq ("@KLIBC@", "no")
ifeq ("@STATIC_LINK@", "no")
- LIB_SHARED=$(top_builddir)/lib/libdmraid.so
+ LIB_SHARED = libdmraid.so
LIB_EVENTS_SHARED=$(LIB_EVENTS_NAME).so
TARGETS += $(LIB_SHARED) $(LIB_EVENTS_SHARED)
endif
@@ -73,12 +73,10 @@
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
+DMRAID_LIB_VERSION = $(DMRAID_LIB_MAJOR).$(DMRAID_LIB_MINOR).$(DMRAID_LIB_SUBMINOR)
+$(LIB_SHARED): $(OBJECTS) $(LD_DEPS)
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS) -ldevmapper-event \
+ -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_MAJOR) $(CLDFLAGS)
$(LIB_EVENTS_SHARED): $(OBJECTS2)
$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS2) \
next reply other threads:[~2010-05-30 17:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-30 17:41 zkabelac [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-05-30 22:21 dmraid/lib Makefile.in zkabelac
2010-05-28 12:35 zkabelac
2010-05-28 8:46 zkabelac
2010-05-27 19:47 zkabelac
2009-09-16 11:51 heinzm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100530174122.31782.qmail@sourceware.org \
--to=zkabelac@sourceware.org \
--cc=dm-cvs@sourceware.org \
--cc=dm-devel@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox