From: zkabelac@sourceware.org
To: dm-cvs@sourceware.org, dm-devel@redhat.com
Subject: dmraid/lib Makefile.in
Date: 30 May 2010 22:21:32 -0000 [thread overview]
Message-ID: <20100530222132.21903.qmail@sourceware.org> (raw)
CVSROOT: /cvs/dm
Module name: dmraid
Changes by: zkabelac@sourceware.org 2010-05-30 22:21:31
Modified files:
lib : Makefile.in
Log message:
Remove VPATH
Create complete TARGETS before include of make.tmpl
Move LIB_SHARED and LIB_EVENTS_SHARED outside of 'if' block
Add support for DEVMAPPEREVENT_CFLAGS
Create soname.major link as well in libdir
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/lib/Makefile.in.diff?cvsroot=dm&r1=1.15&r2=1.16
--- dmraid/lib/Makefile.in 2010/05/30 19:15:26 1.15
+++ dmraid/lib/Makefile.in 2010/05/30 22:21:31 1.16
@@ -7,7 +7,6 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
-VPATH = @srcdir@
SOURCES = \
activate/activate.c \
@@ -56,22 +55,22 @@
LIB_STATIC = libdmraid.a
LIB_EVENTS_NAME = libdmraid-events-isw
+LIB_SHARED = libdmraid.so
+LIB_EVENTS_SHARED=$(LIB_EVENTS_NAME).so
USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \
$(AWK) -f $(top_srcdir)/tools/relpath.awk)
TARGETS = $(LIB_STATIC)
-include $(top_builddir)/make.tmpl
-
ifeq ("@KLIBC@", "no")
ifeq ("@STATIC_LINK@", "no")
- LIB_SHARED = libdmraid.so
- LIB_EVENTS_SHARED=$(LIB_EVENTS_NAME).so
TARGETS += $(LIB_SHARED) $(LIB_EVENTS_SHARED)
endif
endif
-all: $(TARGETS)
+include $(top_builddir)/make.tmpl
+
+INCLUDES += $(DEVMAPPEREVENT_CFLAGS)
DMRAID_LIB_VERSION = $(DMRAID_LIB_MAJOR).$(DMRAID_LIB_MINOR).$(DMRAID_LIB_SUBMINOR)
$(LIB_SHARED): $(OBJECTS) $(LD_DEPS)
@@ -95,11 +94,13 @@
install_$(LIB_SHARED): $(LIB_SHARED)
$(INSTALL_PROGRAM) -D $< $(DESTDIR)$(libdir)/$(<F).$(DMRAID_LIB_VERSION)
$(INSTALL_DIR) $(DESTDIR)$(usrlibdir)
+ $(LN_S) -f $(<F).$(DMRAID_LIB_VERSION) $(DESTDIR)$(libdir)/$(<F).$(DMRAID_LIB_MAJOR)
$(LN_S) -f $(USRLIB_RELPATH)$(<F).$(DMRAID_LIB_VERSION) $(DESTDIR)$(usrlibdir)/$(<F)
remove_$(LIB_SHARED):
- $(RM) $(DESTDIR)$(libdir)/$(notdir $(LIB_SHARED)).$(DMRAID_LIB_VERSION)
$(RM) $(DESTDIR)$(usrlibdir)/$(notdir $(LIB_SHARED))
+ $(RM) $(DESTDIR)$(libdir)/$(notdir $(LIB_SHARED)).$(DMRAID_LIB_MAJOR)
+ $(RM) $(DESTDIR)$(libdir)/$(notdir $(LIB_SHARED)).$(DMRAID_LIB_VERSION)
install_$(LIB_STATIC): $(LIB_STATIC)
$(INSTALL_DATA) -D $< $(DESTDIR)$(usrlibdir)/$(LIB_STATIC)
next reply other threads:[~2010-05-30 22:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-30 22:21 zkabelac [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-05-30 17:41 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=20100530222132.21903.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