X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2FMakefile;h=0b22fb9c2df5080f7c66a762570eb31eb71bc718;hb=1017f139b311d7185f57f803c176f191e6d0ce3b;hp=b72d5b11d98bc8ce5aa7e1cb54f1d2c3417b2b37;hpb=1ef985452b0247ec32799b64ecabb85cb8ffe473;p=elogind.git

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index b72d5b11d..0b22fb9c2 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -1,14 +1,13 @@
 # Makefile for udev extra invoked from the udev main Makefile
 #
-# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+# Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
 #
 # Released under the GNU General Public License, version 2.
 #
 
 PROG = vol_id
-LIBVOLUME_ID = libvolume_id/libvolume_id.a
 GEN_HEADERS =
-MAN_PAGES =
+MAN_PAGES = vol_id.8
 
 prefix =
 etcdir =	${prefix}/etc
@@ -32,15 +31,15 @@ all: $(PROG) $(MAN_PAGES)
 	$(E) "  CC      " $@
 	$(Q) $(CC) -c $(CFLAGS) $< -o $@
 
-$(LIBVOLUME_ID):
-	$(Q) $(MAKE) -C libvolume_id
+lib/libvolume_id.a:
+	$(Q) $(MAKE) -C lib
 
-$(PROG): %: $(HEADERS) %.o $(LIBVOLUME_ID)
+$(PROG): %: $(HEADERS) %.o lib/libvolume_id.a
 	$(E) "  LD      " $@
-	$(Q) $(LD) $(LDFLAGS) $@.o $(LIBVOLUME_ID) -o $@ $(LIBUDEV) $(LIB_OBJS)
-ifneq ($(strip $(STRIPCMD)),)
-	$(E) "  STRIP   " $@
-	$(Q) $(STRIPCMD) $@
+ifeq ($(strip $(VOLUME_ID_STATIC)),true)
+	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS)
+else
+	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS)
 endif
 
 # man pages
@@ -52,15 +51,17 @@ endif
 clean:
 	$(E) "  CLEAN   "
 	$(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
-	$(Q) $(MAKE) -C libvolume_id clean
+	$(Q) $(MAKE) -C lib clean
 .PHONY: clean
 
 install-bin: all
-	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
+	$(MAKE) -C lib install
 .PHONY: install-bin
 
 uninstall-bin:
-	- rm $(DESTDIR)$(sbindir)/$(PROG)
+	- rm $(DESTDIR)$(libudevdir)/$(PROG)
+	$(MAKE) -C lib uninstall
 .PHONY: uninstall-bin
 
 install-man: