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=30c0abb9a4e683462f999eb5d219602286ac4e6a;hpb=accff726856a0b3258a413d823a534f4f437e6b2;p=elogind.git

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 30c0abb9a..0b22fb9c2 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -1,24 +1,22 @@
 # 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 =
-exec_prefix =	${prefix}
 etcdir =	${prefix}/etc
-sbindir =	${exec_prefix}/sbin
-usrbindir =	${exec_prefix}/usr/bin
-usrsbindir =	${exec_prefix}/usr/sbin
+sbindir =	${prefix}/sbin
+usrbindir =	${prefix}/usr/bin
+usrsbindir =	${prefix}/usr/sbin
+libudevdir =	${prefix}/lib/udev
 mandir =	${prefix}/usr/share/man
 configdir =	${etcdir}/udev/
-srcdir = .
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
@@ -30,33 +28,40 @@ all: $(PROG) $(MAN_PAGES)
 .DEFAULT: all
 
 %.o: %.c $(GEN_HEADERS)
-	$(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+	$(E) "  CC      " $@
+	$(Q) $(CC) -c $(CFLAGS) $< -o $@
 
-$(LIBVOLUME_ID):
-	$(MAKE) -C libvolume_id
+lib/libvolume_id.a:
+	$(Q) $(MAKE) -C lib
 
-$(PROG): %: $(HEADERS) %.o $(LIBVOLUME_ID)
-	$(QUIET) $(LD) $(LDFLAGS) $@.o $(LIBVOLUME_ID) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
-ifneq ($(strip $(STRIPCMD)),)
-	$(QUIET) $(STRIPCMD) $@
+$(PROG): %: $(HEADERS) %.o lib/libvolume_id.a
+	$(E) "  LD      " $@
+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
 %.8: %.xml
-	xmlto man $?
+	$(E) "  XMLTO   " $@
+	$(Q) xmlto man $?
 .PRECIOUS: %.8
 
 clean:
-	rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
-	$(MAKE) -C libvolume_id clean
+	$(E) "  CLEAN   "
+	$(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+	$(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: