From: zkabelac@sourceware.org
To: dm-cvs@sourceware.org, dm-devel@redhat.com
Subject: dmraid/tools Makefile.in
Date: 27 May 2010 19:50:28 -0000 [thread overview]
Message-ID: <20100527195028.22238.qmail@sourceware.org> (raw)
CVSROOT: /cvs/dm
Module name: dmraid
Changes by: zkabelac@sourceware.org 2010-05-27 19:50:28
Modified files:
tools : Makefile.in
Log message:
Use top_builddir
Link only with dmraid (pthread is devmapper dependency)
Do not link DMEVENTTOOLLIBS with dmraid
-ldl is linked via libdmraid
Use new INSTALL
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/tools/Makefile.in.diff?cvsroot=dm&r1=1.8&r2=1.9
--- 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
next reply other threads:[~2010-05-27 19:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-27 19:50 zkabelac [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-05-30 17:39 dmraid/tools Makefile.in zkabelac
2010-05-28 8:37 zkabelac
2010-03-19 11:29 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=20100527195028.22238.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.