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: rename subdirectory
[elogind.git]
/
extras
/
volume_id
/
Makefile
diff --git
a/extras/volume_id/Makefile
b/extras/volume_id/Makefile
index 30c0abb9a4e683462f999eb5d219602286ac4e6a..78dfd867bc6b41c62c290913fce867cce99a348c 100644
(file)
--- a/
extras/volume_id/Makefile
+++ b/
extras/volume_id/Makefile
@@
-1,24
+1,22
@@
# Makefile for udev extra invoked from the udev main Makefile
#
# Makefile for udev extra invoked from the udev main Makefile
#
-# Copyright (C) 2004-200
5
Kay Sievers <kay.sievers@vrfy.org>
+# Copyright (C) 2004-200
6
Kay Sievers <kay.sievers@vrfy.org>
#
# Released under the GNU General Public License, version 2.
#
PROG = vol_id
#
# Released under the GNU General Public License, version 2.
#
PROG = vol_id
-LIBVOLUME_ID = libvolume_id/libvolume_id.a
GEN_HEADERS =
MAN_PAGES =
prefix =
GEN_HEADERS =
MAN_PAGES =
prefix =
-exec_prefix = ${prefix}
etcdir = ${prefix}/etc
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/
mandir = ${prefix}/usr/share/man
configdir = ${etcdir}/udev/
-srcdir = .
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
@@
-30,33
+28,40
@@
all: $(PROG) $(MAN_PAGES)
.DEFAULT: all
%.o: %.c $(GEN_HEADERS)
.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)
+$(PROG): %: $(HEADERS) %.o lib/libvolume_id.a
+ $(E) " LD " $@
+ $(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS)
ifneq ($(strip $(STRIPCMD)),)
ifneq ($(strip $(STRIPCMD)),)
- $(QUIET) $(STRIPCMD) $@
+ $(E) " STRIP " $@
+ $(Q) $(STRIPCMD) $@
endif
# man pages
%.8: %.xml
endif
# man pages
%.8: %.xml
- xmlto man $?
+ $(E) " XMLTO " $@
+ $(Q) xmlto man $?
.PRECIOUS: %.8
clean:
.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
.PHONY: clean
install-bin: all
- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+ $(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+ $(MAKE) -C lib install
.PHONY: install-bin
uninstall-bin:
- rm $(DESTDIR)$(sbindir)/$(PROG)
.PHONY: install-bin
uninstall-bin:
- rm $(DESTDIR)$(sbindir)/$(PROG)
+ $(MAKE) -C lib uninstall
.PHONY: uninstall-bin
install-man:
.PHONY: uninstall-bin
install-man: