diff options
| -rw-r--r-- | extras/volume_id/Makefile | 11 | ||||
| -rw-r--r-- | 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 80f9755d19..6e5006594a 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 b73172e37e..17992ba02e 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 \ |