From f29fdd3cef35d6282c4af499b4e137021ace62e0 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 10 May 2007 12:40:18 +0200
Subject: [PATCH] volume_id: vol_id depends on libvolume_id

---
 extras/volume_id/Makefile     | 11 ++++++++---
 extras/volume_id/lib/Makefile | 10 +++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 80f9755d1..6e5006594 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -23,16 +23,21 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL}
 
-all: $(PROG) $(MAN_PAGES)
+all: lib $(PROG) $(MAN_PAGES)
 .PHONY: all
 .DEFAULT: all
 
+.SUFFIXES:
+
 %.o: %.c $(GEN_HEADERS)
 	$(E) "  CC      " $@
 	$(Q) $(CC) -c $(CFLAGS) $< -o $@
 
-lib/libvolume_id.a:
-	$(Q) $(MAKE) -C lib
+lib:
+	$(Q) $(MAKE) -C $@
+.PHONY: lib
+
+lib/libvolume_id.a: lib
 
 $(PROG): %: $(HEADERS) %.o lib/libvolume_id.a
 	$(E) "  LD      " $@
diff --git a/extras/volume_id/lib/Makefile b/extras/volume_id/lib/Makefile
index b73172e37..17992ba02 100644
--- a/extras/volume_id/lib/Makefile
+++ b/extras/volume_id/lib/Makefile
@@ -63,15 +63,15 @@ all: libvolume_id.a $(SHLIB) libvolume_id.pc
 .PHONY: all
 .DEFAULT: all
 
+.SUFFIXES:
+
 %.o: %.c
 	$(E) "  CC      " $@
 	$(Q) $(CC) -c $(CFLAGS) $< -o $@
 
-.shlib:
-	$(Q) mkdir .shlib
-
-.shlib/%.o: %.c .shlib
+.shlib/%.o: %.c
 	$(E) "  CC      " $@
+	$(Q) mkdir -p $(dir $@)
 	$(Q) $(CC) -c $(CFLAGS) -fPIC $< -o $@
 
 libvolume_id.a: $(HEADERS) $(OBJS)
@@ -81,7 +81,7 @@ libvolume_id.a: $(HEADERS) $(OBJS)
 	$(E) "  RANLIB  " $@
 	$(Q) $(RANLIB) $@
 
-$(SHLIB): $(HEADERS) .shlib $(addprefix .shlib/,$(OBJS))
+$(SHLIB): $(HEADERS) $(addprefix .shlib/,$(OBJS))
 	$(E) "  CC      " $@
 	$(Q) $(CC) -shared $(CFLAGS) -o $@ \
 		-Wl,-soname,libvolume_id.so.$(SHLIB_CUR),--version-script,exported_symbols \
-- 
2.30.2