chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
volume_id: enable GFS probing code, add LABEL support
[elogind.git]
/
extras
/
volume_id
/
Makefile
diff --git
a/extras/volume_id/Makefile
b/extras/volume_id/Makefile
index 72e2d3abb10fb930daa0fe015f1aed3f7bf9f1e8..50d5e338c2cc36e23b6093f306bd450a62fc90e7 100644
(file)
--- a/
extras/volume_id/Makefile
+++ b/
extras/volume_id/Makefile
@@
-7,7
+7,7
@@
PROG = vol_id
GEN_HEADERS =
PROG = vol_id
GEN_HEADERS =
-MAN_PAGES =
+MAN_PAGES =
vol_id.8
prefix =
etcdir = ${prefix}/etc
prefix =
etcdir = ${prefix}/etc
@@
-18,21
+18,26
@@
libudevdir = ${prefix}/lib/udev
mandir = ${prefix}/usr/share/man
configdir = ${etcdir}/udev/
mandir = ${prefix}/usr/share/man
configdir = ${etcdir}/udev/
-INSTALL =
/usr/bin/
install -c
+INSTALL = install -c
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL
_PROGRAM
}
+INSTALL_SCRIPT = ${INSTALL}
-all: $(PROG) $(MAN_PAGES)
+all:
lib
$(PROG) $(MAN_PAGES)
.PHONY: all
.DEFAULT: all
.PHONY: all
.DEFAULT: all
+.SUFFIXES:
+
%.o: %.c $(GEN_HEADERS)
$(E) " CC " $@
$(Q) $(CC) -c $(CFLAGS) $< -o $@
%.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 " $@
$(PROG): %: $(HEADERS) %.o lib/libvolume_id.a
$(E) " LD " $@
@@
-41,10
+46,6
@@
ifeq ($(strip $(VOLUME_ID_STATIC)),true)
else
$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS)
endif
else
$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS)
endif
-ifneq ($(strip $(STRIPCMD)),)
- $(E) " STRIP " $@
- $(Q) $(STRIPCMD) $@
-endif
# man pages
%.8: %.xml
# man pages
%.8: %.xml
@@
-59,18
+60,20
@@
clean:
.PHONY: clean
install-bin: all
.PHONY: clean
install-bin: all
- $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+ $(INSTALL) -d $(DESTDIR)$(libudevdir)
+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
$(MAKE) -C lib install
.PHONY: install-bin
uninstall-bin:
$(MAKE) -C lib install
.PHONY: install-bin
uninstall-bin:
- - rm $(DESTDIR)$(
sbin
dir)/$(PROG)
+ - rm $(DESTDIR)$(
libudev
dir)/$(PROG)
$(MAKE) -C lib uninstall
.PHONY: uninstall-bin
install-man:
$(MAKE) -C lib uninstall
.PHONY: uninstall-bin
install-man:
- $(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
-.PHONY: uninstall-man
+ $(INSTALL) -d $(DESTDIR)$(mandir)/man8
+ $(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
+.PHONY: install-man
uninstall-man:
-rm -f $(DESTDIR)$(mandir)/man8/$(PROG).8
uninstall-man:
-rm -f $(DESTDIR)$(mandir)/man8/$(PROG).8