Merge branch 'master' of gregkh@master.kernel.org:/pub/scm/linux/hotplug/udev

[elogind.git] / extras / volume_id / Makefile

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index a936e43bb229ced1ee7a5509578e8791d560d85c..30c0abb9a4e683462f999eb5d219602286ac4e6a 100644 (file)
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -5,12 +5,8 @@
 # Released under the GNU General Public License, version 2.
 #
 
-VOLUME_ID_BASE=volume_id
-include $(VOLUME_ID_BASE)/Makefile.inc
-
 PROG = vol_id
-OBJS = $(VOLUME_ID_OBJS)
-HEADERS = $(VOLUME_ID_HEADERS)
+LIBVOLUME_ID = libvolume_id/libvolume_id.a
 GEN_HEADERS =
 MAN_PAGES =
 
@@ -36,8 +32,11 @@ all: $(PROG) $(MAN_PAGES)
 %.o: %.c $(GEN_HEADERS)
        $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
-$(PROG): %: $(HEADERS) %.o $(OBJS)
-       $(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+$(LIBVOLUME_ID):
+       $(MAKE) -C libvolume_id
+
+$(PROG): %: $(HEADERS) %.o $(LIBVOLUME_ID)
+       $(QUIET) $(LD) $(LDFLAGS) $@.o $(LIBVOLUME_ID) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
 ifneq ($(strip $(STRIPCMD)),)
        $(QUIET) $(STRIPCMD) $@
 endif
@@ -49,6 +48,7 @@ endif
 
 clean:
        rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+       $(MAKE) -C libvolume_id clean
 .PHONY: clean
 
 install-bin: all
@@ -60,11 +60,11 @@ uninstall-bin:
 .PHONY: uninstall-bin
 
 install-man:
-       @echo "Please create a man page for this tool."
+       $(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
 .PHONY: uninstall-man
 
 uninstall-man:
-       @echo "Please create a man page for this tool."
+       -rm -f $(DESTDIR)$(mandir)/man8/$(PROG).8
 .PHONY: uninstall-man
 
 install-config: