chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EXTRAS/Makefile: fix install targets to match main Makefile
[elogind.git]
/
extras
/
volume_id
/
Makefile
diff --git
a/extras/volume_id/Makefile
b/extras/volume_id/Makefile
index 6a3d2866c414ff7f325de3756668f4d060fc41b6..c1dd74f0f70285b677e462c45be66e20cef137e6 100644
(file)
--- a/
extras/volume_id/Makefile
+++ b/
extras/volume_id/Makefile
@@
-1,13
+1,13
@@
-# Makefile for
udev_
volume_id
+# Makefile for volume_id
#
#
-# Copyright (C) 2004
Kay Sievers <kay
@vrfy.org>
+# Copyright (C) 2004
, 2005 Kay Sievers <kay.sievers
@vrfy.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
#
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
#
-PROG =
udev_volume
_id
+PROG =
vol
_id
all: $(PROG)
all: $(PROG)
@@
-28,23
+28,27
@@
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
-override CFLAGS+=-Wall -fno-builtin
-OBJS = volume_id.o udev_volume_id.o
-HEADERS = volume_id.h
+VOLUME_ID_BASE=volume_id
+include $(VOLUME_ID_BASE)/Makefile.inc
+
+OBJS = vol_id.o $(VOLUME_ID_OBJS) $(LIBUDEV)
+HEADERS = $(VOLUME_ID_HEADERS)
$(OBJS): $(HEADERS)
$(OBJS): $(HEADERS)
+.c.o:
+ $(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
+
$(PROG): $(OBJS) $(HEADERS)
$(PROG): $(OBJS) $(HEADERS)
- $(
LD) $(LDFLAGS) -o $(PROG) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_
OBJS)
+ $(
QUIET) $(LD) $(LDFLAGS) -o $(PROG) $(
OBJS)
clean:
rm -f $(PROG) $(OBJS)
spotless: clean
clean:
rm -f $(PROG) $(OBJS)
spotless: clean
-install: all
- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(usrsbindir)/$(PROG)
-
-uninstall:
- - rm $(DESTDIR)$(usrsbindir)/$(PROG)
+install-bin: all
+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+uninstall-bin:
+ - rm $(DESTDIR)$(sbindir)/$(PROG)