always include config.h from Makefile

diff --git a/Makefile.am.inc b/Makefile.am.inc
new file mode 100644 (file)
index 0000000..f61706a
--- /dev/null
+++ b/Makefile.am.inc
@@ -0,0 +1,9 @@
+AM_CPPFLAGS = \
+       -include $(top_builddir)/config.h \
+       -DSYSCONFDIR=\""$(sysconfdir)"\" \
+       -DUDEV_PREFIX=\""$(udev_prefix)"\" \
+       -D_LIBUDEV_COMPILATION
+
+AM_CFLAGS =
+
+AM_LDFLAGS =

diff --git a/extras/ata_id/Makefile.am b/extras/ata_id/Makefile.am
index ce4a32330f6b88c0021096d8e58794e35d1bb491..89aa02f5da7eb73e11938ec3edac53059aeff648 100644 (file)
--- 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 d4db32b783543fb707f901813f2ea63931eaccd4..ec14366a231ccc43dad525bdcc1f19863c5f671f 100644 (file)
--- 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 a92f4aa9f59a384bd77314a59bd70dc5a92a1b13..60315dd84fda0aa7a6deadbb34eb6b5cb1e8cdb4 100644 (file)
--- 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 3bdbbd85b28521889abc69e5f1cdb1517fe5d0b5..652d2c472d08b259a89dca8d65b91b5bc05520a8 100644 (file)
--- 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 59fc4e560f715d076c70a5d2556bfa273677f586..a62dd20984414968ffaa8bcd93761be845d99f85 100644 (file)
--- 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 2ed383d95ece19adcaebcfb79c22f1e7fd8c01fb..49e598e1f4d7bba1f8e96804ae826ef6d5f6c883 100644 (file)
--- 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 245a72fffbc34ad4bf68da604e54d966d926a1c1..71ab5d34ee8868e9add0b324a5e41320640c0d5e 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/extras/scsi_id/Makefile.am b/extras/scsi_id/Makefile.am
index b6bebb69a590c9c69011c84c6f053102961e3863..0b5dbf0450a49b0ab17c2235de5d09b68e51cfcf 100644 (file)
--- 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 d692a86799db76ef2f2ed9bb64ced6267930013f..bf06ed2794abd233a8fe2af4fecdd8391e4a54e9 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/extras/usb_id/Makefile.am b/extras/usb_id/Makefile.am
index c8d743b5f4364b4c214a37463d42741a53140942..89d59657fb9a527d3b496ce6af555ebaf1160339 100644 (file)
--- 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 9938dc00ef7340c09fba698c3faf514e32656715..f482147b68cd270fad090a8b82eebb57d7418e7f 100644 (file)
--- 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 <config.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>

diff --git a/extras/volume_id/Makefile.am b/extras/volume_id/Makefile.am
index 3e11d5c348f40b9a2e781e5c89f06bc8c7e16f45..4d904d83c36144a979aafa9e387276a48b2e3b01 100644 (file)
--- 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 \

diff --git a/udev/Makefile.am b/udev/Makefile.am
index 5d47baa0b36e9bc3389c64441b7c766042ad8a7d..323f508b2ddfdab1a89f6f031e24ff143bf9c09d 100644 (file)
--- a/udev/Makefile.am
+++ b/udev/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.am.inc
+
 SUBDIRS = \
        lib
 
@@ -8,11 +10,6 @@ sbin_PROGRAMS = \
 noinst_PROGRAMS = \
        test-udev
 
-AM_CPPFLAGS = \
-       -DSYSCONFDIR=\""$(sysconfdir)"\" \
-       -DUDEV_PREFIX=\""$(udev_prefix)"\" \
-       -D_LIBUDEV_COMPILATION
-
 common_ldadd =
 
 common_files = \

diff --git a/udev/lib/Makefile.am b/udev/lib/Makefile.am
index 4cbae2e4ca68e42eb44e9eba1b296734605ac89f..7329ab6c65f6e2d19a9dbc510c3ab6d2db174033 100644 (file)
--- a/udev/lib/Makefile.am
+++ b/udev/lib/Makefile.am
@@ -1,7 +1,4 @@
-AM_CPPFLAGS = \
-       -DSYSCONFDIR=\""$(sysconfdir)"\" \
-       -DUDEV_PREFIX=\""$(udev_prefix)"\" \
-       -D_LIBUDEV_COMPILATION
+include $(top_srcdir)/Makefile.am.inc
 
 noinst_PROGRAMS = \
        test-libudev

diff --git a/udev/lib/libudev-ctrl.c b/udev/lib/libudev-ctrl.c
index f7cec371b1037377d3ffeefbc5d9b7a5a7e94749..7d37074fef898c0b8eabf163d931dac43a81b819 100644 (file)
--- a/udev/lib/libudev-ctrl.c
+++ b/udev/lib/libudev-ctrl.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index 76ef298a3420aec4b0f9fbb3ae4973c6b83aa02c..cc44c78ad79c3b91426915a4c40ec2accb97e38c 100644 (file)
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>

diff --git a/udev/lib/libudev-enumerate.c b/udev/lib/libudev-enumerate.c
index b8e4807c478cffd79f7607a286cfd94270e4a713..ca5e30e4a13a5c4521c08d17bc70859eada87752 100644 (file)
--- a/udev/lib/libudev-enumerate.c
+++ b/udev/lib/libudev-enumerate.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>

diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c
index f61ddb0b533a3ffc40a7fe47fa5f0e2b9b9b6038..0dc8e10cbc68fa38d57ba43e2f30f544ab4fc3cc 100644 (file)
--- a/udev/lib/libudev-monitor.c
+++ b/udev/lib/libudev-monitor.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>

diff --git a/udev/lib/libudev-private.h b/udev/lib/libudev-private.h
index 1756be5f25f89af8d98125a412983a8b18bb4ae1..c8063d2d64dbaea741c3b5f7f32da0f3464c5102 100644 (file)
--- a/udev/lib/libudev-private.h
+++ b/udev/lib/libudev-private.h
@@ -20,8 +20,6 @@
 #ifndef _LIBUDEV_PRIVATE_H_
 #define _LIBUDEV_PRIVATE_H_
 
-#include "config.h"
-
 #include <syslog.h>
 #include "libudev.h"
 #include "list.h"

diff --git a/udev/lib/libudev-util.c b/udev/lib/libudev-util.c
index 6ec835e62445695dc05a4432819e6a09102f5007..7eadc7f2961270842691b12b0b223dee5174a095 100644 (file)
--- a/udev/lib/libudev-util.c
+++ b/udev/lib/libudev-util.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>

diff --git a/udev/lib/libudev.c b/udev/lib/libudev.c
index 04ad26c6fbc5ec076eb77ea16ee35bc7758d9823..2d34925912b1e7f9cb33337a8e2e30bee6bbaa71 100644 (file)
--- a/udev/lib/libudev.c
+++ b/udev/lib/libudev.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>

diff --git a/udev/lib/test-libudev.c b/udev/lib/test-libudev.c
index 50123f6ec7eb38613c53ec945a6e4ef5d5480f28..39330a74c6cbbe036370008b01db80ec598556c3 100644 (file)
--- a/udev/lib/test-libudev.c
+++ b/udev/lib/test-libudev.c
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdarg.h>
 #include <unistd.h>

diff --git a/udev/test-udev.c b/udev/test-udev.c
index dae7aaa634c288d7a7ab2d3c4ffaae36d15f7f3c..4aa7999fc0e57ce1194c993a8a4b3b75828abd77 100644 (file)
--- a/udev/test-udev.c
+++ b/udev/test-udev.c
@@ -16,8 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>

diff --git a/udev/udev.h b/udev/udev.h
index 55814cee0e7974e8c3f44780859a6aec6db44078..b8ae5f00a8b373dde26015a6a9de1a1b21d95543 100644 (file)
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -19,8 +19,6 @@
 #ifndef _UDEV_H_
 #define _UDEV_H_
 
-#include "config.h"
-
 #include <sys/types.h>
 #include <sys/param.h>
 

diff --git a/udev/udev_rules_parse.c b/udev/udev_rules_parse.c
index a46eff98e664d557ac44bb7c7fe6294609ba2d40..541d651f0e1f1ed017d414a8667123482ccedfef 100644 (file)
--- a/udev/udev_rules_parse.c
+++ b/udev/udev_rules_parse.c
@@ -16,8 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/udev/udevadm-control.c b/udev/udevadm-control.c
index e3a91fc9a40f6688ff0c7dfa1973dafff90394f3..baffd0d2044ce55d71e7c90b9820d29301828e7f 100644 (file)
--- a/udev/udevadm-control.c
+++ b/udev/udevadm-control.c
@@ -12,8 +12,6 @@
  * GNU General Public License for more details.
  */
 
-#include "config.h"
-
 #include <time.h>
 #include <errno.h>
 #include <stdio.h>

diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index abb424bfea4895596d3d7c2cdf105dca7b8562e8..3cd889fe00602a8ac2e6c51dfa7f35b3d89058cc 100644 (file)
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -15,8 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/udev/udevadm.c b/udev/udevadm.c
index 6de50f42537205d8429472ed864d8d8b19171bdf..b18114273c8e839dec6e0ca5a6d82400e270a604 100644 (file)
--- a/udev/udevadm.c
+++ b/udev/udevadm.c
@@ -15,8 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/udev/udevd.c b/udev/udevd.c
index d64beef3a9b29fdfc02765d7da21eb6affe1cf0d..e1ae7eac5459ecaea2fe8cbd5b9f119431557275 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -16,8 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <stddef.h>
 #include <signal.h>
 #include <unistd.h>