r417 - lvm2/trunk/tools

[Bastian Blank]

Author: waldi
Date: Sat Apr  7 16:06:17 2007
New Revision: 417

Modified:
   lvm2/trunk/tools/Makefile.in
Log:
Resync with upstream.


Modified: lvm2/trunk/tools/Makefile.in
==============================================================================
--- lvm2/trunk/tools/Makefile.in	(original)
+++ lvm2/trunk/tools/Makefile.in	Sat Apr  7 16:06:17 2007
@@ -20,7 +20,7 @@
   SUBDIRS += fsadm
 endif
 
-lib_SOURCES =\
+SOURCES =\
 	dumpconfig.c \
 	formats.c \
 	lvchange.c \
@@ -65,12 +65,6 @@
 	vgscan.c \
 	vgsplit.c
 
-tool_SOURCES = lvm.c
-
-lib_OBJECTS = $(lib_SOURCES:%.c=%.o)
-
-SOURCES = $(lib_SOURCES) $(tool_SOURCES)
-
 TARGETS =\
 	.commands \
 	lvm
@@ -105,12 +99,12 @@
 
 include $(top_srcdir)/make.tmpl
 
-lvm: $(OBJECTS) $(top_srcdir)/lib/liblvm.a
-	$(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
+lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm.a
+	$(CC) -o $@ $(OBJECTS) lvm.o $(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
 
-lvm.static: $(OBJECTS) $(top_srcdir)/lib/liblvm.a
-	$(CC) -o $@ $(OBJECTS) -static $(LDFLAGS) $(LVMLIBS) $(LIBS) \
-		-rdynamic
+lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm.a
+	$(CC) -o $@ $(OBJECTS) lvm-static.o -static $(LDFLAGS) $(LVMLIBS) \
+		$(LIBS) -rdynamic
 
 liblvm2cmd.a: $(top_srcdir)/lib/liblvm.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
 	cat $(top_srcdir)/lib/liblvm.a > $@