From 0e47c219fc5c509f277c9a44f2d29362fff88193 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 30 Aug 2005 17:03:25 +0200 Subject: Makefile: remove all the duplicated rules Signed-off-by: Kay Sievers --- extras/ata_id/Makefile | 2 +- extras/cdrom_id/Makefile | 2 +- extras/dasd_id/Makefile | 2 +- extras/firmware/Makefile | 2 +- extras/floppy/Makefile | 2 +- extras/run_directory/Makefile | 2 +- extras/usb_id/Makefile | 2 +- extras/volume_id/Makefile | 5 ++--- 8 files changed, 9 insertions(+), 10 deletions(-) (limited to 'extras') diff --git a/extras/ata_id/Makefile b/extras/ata_id/Makefile index fb45bcca64..eab01ad9ab 100644 --- a/extras/ata_id/Makefile +++ b/extras/ata_id/Makefile @@ -28,7 +28,7 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 INSTALL_SCRIPT = ${INSTALL_PROGRAM} -OBJS = ata_id.o ../../udev.a +OBJS = ata_id.o $(LIBUDEV) $(OBJS): $(HEADERS) diff --git a/extras/cdrom_id/Makefile b/extras/cdrom_id/Makefile index 44c9ba2b08..6ea5f14ec1 100644 --- a/extras/cdrom_id/Makefile +++ b/extras/cdrom_id/Makefile @@ -29,7 +29,7 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 INSTALL_SCRIPT = ${INSTALL_PROGRAM} -OBJS = cdrom_id.o ../../udev.a +OBJS = cdrom_id.o $(LIBUDEV) $(OBJS): $(HEADERS) diff --git a/extras/dasd_id/Makefile b/extras/dasd_id/Makefile index 3b0a35f75f..f2c0595de0 100644 --- a/extras/dasd_id/Makefile +++ b/extras/dasd_id/Makefile @@ -28,7 +28,7 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 INSTALL_SCRIPT = ${INSTALL_PROGRAM} -OBJS = dasd_id.o ../../udev.a +OBJS = dasd_id.o $(LIBUDEV) $(OBJS): $(HEADERS) diff --git a/extras/firmware/Makefile b/extras/firmware/Makefile index 913a88db06..343d5295f1 100644 --- a/extras/firmware/Makefile +++ b/extras/firmware/Makefile @@ -28,7 +28,7 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 INSTALL_SCRIPT = ${INSTALL_PROGRAM} -OBJS = $(PROG).o $(VOLUME_ID_OBJS) ../../udev.a ../../libsysfs/sysfs.a +OBJS = $(PROG).o $(LIBUDEV) $(LIBSYSFS) HEADERS = $(OBJS): $(HEADERS) diff --git a/extras/floppy/Makefile b/extras/floppy/Makefile index ab0cd17e58..5380590c9b 100644 --- a/extras/floppy/Makefile +++ b/extras/floppy/Makefile @@ -28,7 +28,7 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 INSTALL_SCRIPT = ${INSTALL_PROGRAM} -OBJS = $(PROG).o ../../udev.a +OBJS = $(PROG).o $(LIBUDEV) $(OBJS): $(HEADERS) diff --git a/extras/run_directory/Makefile b/extras/run_directory/Makefile index 14b4725dae..c1a83e3c0b 100644 --- a/extras/run_directory/Makefile +++ b/extras/run_directory/Makefile @@ -29,7 +29,7 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 INSTALL_SCRIPT = ${INSTALL_PROGRAM} -OBJS = ../../udev.a ../../libsysfs/sysfs.a +OBJS = $(LIBUDEV) .c.o: $(QUIET) $(CC) $(CFLAGS) -c -o $@ $< diff --git a/extras/usb_id/Makefile b/extras/usb_id/Makefile index 0635e91cc5..4347fba407 100644 --- a/extras/usb_id/Makefile +++ b/extras/usb_id/Makefile @@ -28,7 +28,7 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 INSTALL_SCRIPT = ${INSTALL_PROGRAM} -OBJS = $(PROG).o $(VOLUME_ID_OBJS) ../../udev.a ../../libsysfs/sysfs.a +OBJS = $(PROG).o $(VOLUME_ID_OBJS) $(LIBUDEV) $(LIBSYSFS) HEADERS = $(OBJS): $(HEADERS) diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile index 0fadbf5b0e..8ca3bd1333 100644 --- a/extras/volume_id/Makefile +++ b/extras/volume_id/Makefile @@ -31,8 +31,7 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM} VOLUME_ID_BASE=volume_id include $(VOLUME_ID_BASE)/Makefile.inc -OBJS = vol_id.o $(VOLUME_ID_OBJS) -LIB_OBJS=../../udev.a +OBJS = vol_id.o $(VOLUME_ID_OBJS) $(LIBUDEV) HEADERS = $(VOLUME_ID_HEADERS) $(OBJS): $(HEADERS) @@ -41,7 +40,7 @@ $(OBJS): $(HEADERS) $(QUIET) $(CC) $(CFLAGS) -c -o $@ $< $(PROG): $(OBJS) $(HEADERS) - $(QUIET) $(LD) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIB_OBJS) + $(QUIET) $(LD) $(LDFLAGS) -o $(PROG) $(OBJS) clean: rm -f $(PROG) $(OBJS) -- cgit v1.2.3-54-g00ecf