From 38f27948cdafd8a4b90a6b4f1f54b89891983506 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 19 Sep 2008 23:03:49 -0700 Subject: always include config.h from Makefile --- extras/ata_id/Makefile.am | 8 ++------ extras/cdrom_id/Makefile.am | 7 ++----- extras/collect/Makefile.am | 6 ++---- extras/edd_id/Makefile.am | 7 ++----- extras/floppy/Makefile.am | 7 ++----- extras/fstab_import/Makefile.am | 7 ++----- extras/fstab_import/fstab_import.c | 2 -- extras/scsi_id/Makefile.am | 7 ++----- extras/scsi_id/scsi_id.c | 2 -- extras/usb_id/Makefile.am | 7 ++----- extras/usb_id/usb_id.c | 2 -- extras/volume_id/Makefile.am | 7 ++----- 12 files changed, 18 insertions(+), 51 deletions(-) (limited to 'extras') diff --git a/extras/ata_id/Makefile.am b/extras/ata_id/Makefile.am index ce4a32330f..89aa02f5da 100644 --- a/extras/ata_id/Makefile.am +++ b/extras/ata_id/Makefile.am @@ -1,13 +1,9 @@ +include $(top_srcdir)/Makefile.am.inc + udevhomedir = $(udev_prefix)/lib/udev udevhome_PROGRAMS = \ ata_id -AM_CPPFLAGS = \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DUDEV_PREFIX=\""$(udev_prefix)"\" \ - -D_LIBUDEV_COMPILATION \ - -UUSE_SELINUX - ata_id_SOURCES = \ ata_id.c \ ../../udev/lib/libudev.h \ diff --git a/extras/cdrom_id/Makefile.am b/extras/cdrom_id/Makefile.am index d4db32b783..ec14366a23 100644 --- a/extras/cdrom_id/Makefile.am +++ b/extras/cdrom_id/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.am.inc + udevhomedir = $(udev_prefix)/lib/udev udevhome_PROGRAMS = \ cdrom_id @@ -6,11 +8,6 @@ udevrulesdir = $(udev_prefix)/lib/udev/rules.d dist_udevrules_DATA = \ 60-cdrom_id.rules -AM_CPPFLAGS = \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DUDEV_PREFIX=\""$(udev_prefix)"\" \ - -D_LIBUDEV_COMPILATION - cdrom_id_SOURCES = \ cdrom_id.c \ ../../udev/lib/libudev.h \ diff --git a/extras/collect/Makefile.am b/extras/collect/Makefile.am index a92f4aa9f5..60315dd84f 100644 --- a/extras/collect/Makefile.am +++ b/extras/collect/Makefile.am @@ -1,11 +1,9 @@ +include $(top_srcdir)/Makefile.am.inc + udevhomedir = $(udev_prefix)/lib/udev udevhome_PROGRAMS = \ collect -AM_CPPFLAGS = \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DUDEV_PREFIX=\""$(udev_prefix)"\" - distclean-local: rm -f Makefile.in diff --git a/extras/edd_id/Makefile.am b/extras/edd_id/Makefile.am index 3bdbbd85b2..652d2c472d 100644 --- a/extras/edd_id/Makefile.am +++ b/extras/edd_id/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.am.inc + udevhomedir = $(udev_prefix)/lib/udev udevhome_PROGRAMS = \ edd_id @@ -6,11 +8,6 @@ udevrulesdir = $(udev_prefix)/lib/udev/rules.d dist_udevrules_DATA = \ 61-persistent-storage-edd.rules -AM_CPPFLAGS = \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DUDEV_PREFIX=\""$(udev_prefix)"\" \ - -D_LIBUDEV_COMPILATION - edd_id_SOURCES = \ edd_id.c \ ../../udev/lib/libudev.h \ diff --git a/extras/floppy/Makefile.am b/extras/floppy/Makefile.am index 59fc4e560f..a62dd20984 100644 --- a/extras/floppy/Makefile.am +++ b/extras/floppy/Makefile.am @@ -1,12 +1,9 @@ +include $(top_srcdir)/Makefile.am.inc + udevhomedir = $(udev_prefix)/lib/udev udevhome_PROGRAMS = \ create_floppy_devices -AM_CPPFLAGS = \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DUDEV_PREFIX=\""$(udev_prefix)"\" \ - -D_LIBUDEV_COMPILATION - create_floppy_devices_SOURCES = \ create_floppy_devices.c \ ../../udev/lib/libudev.h \ diff --git a/extras/fstab_import/Makefile.am b/extras/fstab_import/Makefile.am index 2ed383d95e..49e598e1f4 100644 --- a/extras/fstab_import/Makefile.am +++ b/extras/fstab_import/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.am.inc + udevhomedir = $(udev_prefix)/lib/udev udevhome_PROGRAMS = \ fstab_import @@ -6,11 +8,6 @@ udevrulesdir = $(udev_prefix)/lib/udev/rules.d dist_udevrules_DATA = \ 79-fstab_import.rules -AM_CPPFLAGS = \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DUDEV_PREFIX=\""$(udev_prefix)"\" \ - -D_LIBUDEV_COMPILATION - fstab_import_SOURCES = \ fstab_import.c \ ../../udev/lib/libudev.h \ diff --git a/extras/fstab_import/fstab_import.c b/extras/fstab_import/fstab_import.c index 245a72fffb..71ab5d34ee 100644 --- a/extras/fstab_import/fstab_import.c +++ b/extras/fstab_import/fstab_import.c @@ -13,8 +13,6 @@ #define _GNU_SOURCE 1 #endif -#include "config.h" - #include #include #include diff --git a/extras/scsi_id/Makefile.am b/extras/scsi_id/Makefile.am index b6bebb69a5..0b5dbf0450 100644 --- a/extras/scsi_id/Makefile.am +++ b/extras/scsi_id/Makefile.am @@ -1,12 +1,9 @@ +include $(top_srcdir)/Makefile.am.inc + udevhomedir = $(udev_prefix)/lib/udev udevhome_PROGRAMS = \ scsi_id -AM_CPPFLAGS = \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DUDEV_PREFIX=\""$(udev_prefix)"\" \ - -D_LIBUDEV_COMPILATION - scsi_id_SOURCES = \ scsi_id.c \ scsi_serial.c \ diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c index d692a86799..bf06ed2794 100644 --- a/extras/scsi_id/scsi_id.c +++ b/extras/scsi_id/scsi_id.c @@ -14,8 +14,6 @@ * Free Software Foundation version 2 of the License. */ -#include "config.h" - #include #include #include diff --git a/extras/usb_id/Makefile.am b/extras/usb_id/Makefile.am index c8d743b5f4..89d59657fb 100644 --- a/extras/usb_id/Makefile.am +++ b/extras/usb_id/Makefile.am @@ -1,12 +1,9 @@ +include $(top_srcdir)/Makefile.am.inc + udevhomedir = $(udev_prefix)/lib/udev udevhome_PROGRAMS = \ usb_id -AM_CPPFLAGS = \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DUDEV_PREFIX=\""$(udev_prefix)"\" \ - -D_LIBUDEV_COMPILATION - usb_id_SOURCES = \ usb_id.c \ ../../udev/lib/libudev.h \ diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c index 9938dc00ef..f482147b68 100644 --- a/extras/usb_id/usb_id.c +++ b/extras/usb_id/usb_id.c @@ -11,8 +11,6 @@ * Free Software Foundation version 2 of the License. */ -#include - #include #include #include diff --git a/extras/volume_id/Makefile.am b/extras/volume_id/Makefile.am index 3e11d5c348..4d904d83c3 100644 --- a/extras/volume_id/Makefile.am +++ b/extras/volume_id/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/Makefile.am.inc + SUBDIRS = \ lib @@ -5,11 +7,6 @@ udevhomedir = $(udev_prefix)/lib/udev udevhome_PROGRAMS = \ vol_id -AM_CPPFLAGS = \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DUDEV_PREFIX=\""$(udev_prefix)"\" \ - -D_LIBUDEV_COMPILATION - vol_id_SOURCES = \ vol_id.c \ ../../udev/lib/libudev.h \ -- cgit v1.2.3-54-g00ecf