always include config.h from Makefile

17 files changed, 3 insertions, 39 deletions

diff --git a/udev/Makefile.am b/udev/Makefile.am
index 5d47baa0b3..323f508b2d 100644
--- 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 4cbae2e4ca..7329ab6c65 100644
--- 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 f7cec371b1..7d37074fef 100644
--- 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 76ef298a34..cc44c78ad7 100644
--- 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 b8e4807c47..ca5e30e4a1 100644
--- 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 f61ddb0b53..0dc8e10cbc 100644
--- 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 1756be5f25..c8063d2d64 100644
--- 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 6ec835e624..7eadc7f296 100644
--- 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 04ad26c6fb..2d34925912 100644
--- 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 50123f6ec7..39330a74c6 100644
--- 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 dae7aaa634..4aa7999fc0 100644
--- 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 55814cee0e..b8ae5f00a8 100644
--- 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 a46eff98e6..541d651f0e 100644
--- 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 e3a91fc9a4..baffd0d204 100644
--- 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 abb424bfea..3cd889fe00 100644
--- 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 6de50f4253..b18114273c 100644
--- 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 d64beef3a9..e1ae7eac54 100644
--- 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>