chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] The following patch fixes some warnings when compiling volume_id
[elogind.git]
/
extras
/
volume_id
/
Makefile
diff --git
a/extras/volume_id/Makefile
b/extras/volume_id/Makefile
index 307fdc2f1611f2131de4542ab825c06dc5f75ce6..efec58f80efb9286ccffbf4418bdf4a51de594be 100644
(file)
--- a/
extras/volume_id/Makefile
+++ b/
extras/volume_id/Makefile
@@
-28,25
+28,21
@@
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
+override CFLAGS+=-
D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
-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) $(SYSFS)
+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) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
clean:
rm -f $(PROG) $(OBJS)
clean:
rm -f $(PROG) $(OBJS)
@@
-54,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)