chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge gregkh@ehlo.org:/home/kay/public_html/pub/scm/linux/hotplug/udev-kay
[elogind.git]
/
extras
/
volume_id
/
Makefile
diff --git
a/extras/volume_id/Makefile
b/extras/volume_id/Makefile
index d0c6e40fa3ecaf19ea65deda533cddf673507a4e..56fdf278b98b4bf3bdacc6ef4a97546a6894ca1c 100644
(file)
--- a/
extras/volume_id/Makefile
+++ b/
extras/volume_id/Makefile
@@
-28,24
+28,13
@@
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 -Wchar-subscripts -Wmissing-declarations \
- -Wnested-externs -Wpointer-arith -Wcast-align \
- -Wsign-compare
-
override CFLAGS+=-D_FILE_OFFSET_BITS=64
override CFLAGS+=-D_FILE_OFFSET_BITS=64
-SYSFS = ../../libsysfs/sysfs_bus.o \
- ../../libsysfs/sysfs_class.o \
- ../../libsysfs/sysfs_device.o \
- ../../libsysfs/sysfs_dir.o \
- ../../libsysfs/sysfs_driver.o \
- ../../libsysfs/sysfs_utils.o \
- ../../libsysfs/dlist.o
-
+VOLUME_ID_BASE=volume_id
+include $(VOLUME_ID_BASE)/Makefile.inc
-
-OBJS = volume_id.o udev_volume_id.o dasdlabel.o $(SYSFS)
-HEADERS = volume_id.h dasdlabel.h
+OBJS = udev_volume_id.o $(VOLUME_ID_OBJS) ../../udev.a
+HEADERS = $(VOLUME_ID_HEADERS)
$(OBJS): $(HEADERS)
$(OBJS): $(HEADERS)
@@
-53,7
+42,7
@@
$(OBJS): $(HEADERS)
$(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
$(PROG): $(OBJS) $(HEADERS)
$(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
$(PROG): $(OBJS) $(HEADERS)
- $(QUIET) $(LD) $(LDFLAGS) -o $(PROG) $(
CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_
LIB_OBJS)
+ $(QUIET) $(LD) $(LDFLAGS) -o $(PROG) $(
OBJS) $(
LIB_OBJS)
clean:
rm -f $(PROG) $(OBJS)
clean:
rm -f $(PROG) $(OBJS)
@@
-61,8
+50,7
@@
clean:
spotless: clean
install: all
spotless: clean
install: all
- $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(
usr
sbindir)/$(PROG)
+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
uninstall:
uninstall:
- - rm $(DESTDIR)$(usrsbindir)/$(PROG)
-
+ - rm $(DESTDIR)$(sbindir)/$(PROG)