[PATCH] klibc: use klcc wrapper instead of our own Makefile

[elogind.git] / extras / volume_id / Makefile

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 8605811cf57381dade48d0a78c8150c622cc4443..91527cc9f51c6a282b1ab7adf13a29dfc17e7339 100644 (file)
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -28,23 +28,13 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
-override CFLAGS+=-Wall -fno-builtin -Wchar-subscripts \
-                -Wpointer-arith -Wcast-align -Wsign-compare
-
 override CFLAGS+=-D_FILE_OFFSET_BITS=64
 
-override 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)
 
@@ -52,7 +42,7 @@ $(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)
@@ -64,4 +54,3 @@ install: all
 
 uninstall:
        - rm $(DESTDIR)$(sbindir)/$(PROG)
-