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 bfe4cf74af52f47da5027ef4eead30da331f44cc..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.sievers@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.
 #
 
-PROG = udev_volume_id
+PROG = vol_id
 
 all:   $(PROG)
 
@@ -28,53 +28,10 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
-override CFLAGS+=-D_FILE_OFFSET_BITS=64
+VOLUME_ID_BASE=volume_id
+include $(VOLUME_ID_BASE)/Makefile.inc
 
-VOLUME_ID_OBJS=                                        \
-       volume_id/ext/ext.o                     \
-       volume_id/fat/fat.o                     \
-       volume_id/hfs/hfs.o                     \
-       volume_id/highpoint/highpoint.o         \
-       volume_id/iso9660/iso9660.o             \
-       volume_id/jfs/jfs.o                     \
-       volume_id/linux_raid/linux_raid.o       \
-       volume_id/linux_swap/linux_swap.o       \
-       volume_id/lvm/lvm.o                     \
-       volume_id/mac/mac.o                     \
-       volume_id/msdos/msdos.o                 \
-       volume_id/ntfs/ntfs.o                   \
-       volume_id/reiserfs/reiserfs.o           \
-       volume_id/udf/udf.o                     \
-       volume_id/ufs/ufs.o                     \
-       volume_id/xfs/xfs.o                     \
-       volume_id/cramfs/cramfs.o               \
-       volume_id/dasd/dasd.o                   \
-       volume_id/volume_id.o                   \
-       volume_id/util.o
-
-VOLUME_ID_HEADERS=                             \
-       volume_id/ext/ext.h                     \
-       volume_id/fat/fat.h                     \
-       volume_id/hfs/hfs.h                     \
-       volume_id/highpoint/highpoint.h         \
-       volume_id/iso9660/iso9660.h             \
-       volume_id/jfs/jfs.h                     \
-       volume_id/linux_raid/linux_raid.h       \
-       volume_id/linux_swap/linux_swap.h       \
-       volume_id/lvm/lvm.h                     \
-       volume_id/mac/mac.h                     \
-       volume_id/msdos/msdos.h                 \
-       volume_id/ntfs/ntfs.h                   \
-       volume_id/reiserfs/reiserfs.h           \
-       volume_id/udf/udf.h                     \
-       volume_id/ufs/ufs.h                     \
-       volume_id/xfs/xfs.h                     \
-       volume_id/cramfs/cramfs.h               \
-       volume_id/dasd/dasd.h                   \
-       volume_id/volume_id.h                   \
-       volume_id/util.h
-
-OBJS = udev_volume_id.o $(VOLUME_ID_OBJS) $(SYSFS)
+OBJS = vol_id.o $(VOLUME_ID_OBJS) $(LIBUDEV)
 HEADERS = $(VOLUME_ID_HEADERS)
 
 $(OBJS): $(HEADERS)
@@ -83,15 +40,15 @@ $(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)
 
 clean:
        rm -f $(PROG) $(OBJS)
 
 spotless: clean
 
-install: all
+install-bin: all
        $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
 
-uninstall:
+uninstall-bin:
        - rm $(DESTDIR)$(sbindir)/$(PROG)