build-sys: include config.h to all files using automake

Do not try to be too smart which compilations need config.h, as most of
them will simply because of the config.h has information about system
capabilities.

5 files changed, 4 insertions, 16 deletions

diff --git a/util/Makefile.am b/util/Makefile.am
index f47924f..1123f68 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,6 +1,6 @@
 # util/Makefile.am for Fluxbox
 SUBDIRS=                fbrun
-AM_CPPFLAGS=            -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
+AM_CPPFLAGS=            -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk -include $(top_builddir)/config.h
 bin_SCRIPTS=            fbsetbg fluxbox-generate_menu startfluxbox
 bin_PROGRAMS=           fbsetroot fluxbox-update_configs fluxbox-remote
 fbsetroot_SOURCES=      fbsetroot.cc fbsetroot.hh
@@ -23,10 +23,10 @@ all-local:	startfluxbox
 clean-local:
                 rm -f startfluxbox fluxbox-generate_menu
 
-fbsetroot.o:    fbsetroot.cc ../config.h $(srcdir)/fbsetroot.hh \
+fbsetroot.o:    fbsetroot.cc $(srcdir)/fbsetroot.hh \
                         $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh
 
-fluxbox-update_configs.o:       fluxbox-update_configs.cc ../config.h \
+fluxbox-update_configs.o:       fluxbox-update_configs.cc \
                         $(top_builddir)/src/defaults.hh
 
 fluxbox-remote.o:       fluxbox-remote.cc
diff --git a/util/fbrun/FbRun.cc b/util/fbrun/FbRun.cc
index fac09b9..66a5fec 100644
--- a/util/fbrun/FbRun.cc
+++ b/util/fbrun/FbRun.cc
@@ -27,10 +27,6 @@
 #include "FbTk/KeyUtil.hh"
 #include "FbTk/FileUtil.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_XPM
 #include <X11/xpm.h>
 #include "fbrun.xpm"
diff --git a/util/fbrun/Makefile.am b/util/fbrun/Makefile.am
index 35317df..57fa1f6 100644
--- a/util/fbrun/Makefile.am
+++ b/util/fbrun/Makefile.am
@@ -1,5 +1,5 @@
 FLUXBOX_SRC_DIR=        ../../src/
-AM_CPPFLAGS=            -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
+AM_CPPFLAGS=            -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk -include $(top_builddir)/config.h
 bin_PROGRAMS=           fbrun
 fbrun_SOURCES=          FbRun.hh FbRun.cc main.cc fbrun.xpm
 fbrun_LDADD=            ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a
diff --git a/util/fbsetroot.cc b/util/fbsetroot.cc
index 4e7981f..6dd478b 100644
--- a/util/fbsetroot.cc
+++ b/util/fbsetroot.cc
@@ -26,10 +26,6 @@
 #include "../src/FbTk/GContext.hh"
 #include "../src/FbRootWindow.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xatom.h>
 
 #ifdef HAVE_CSTRING
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index a8052a2..a4fe6f2 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -26,10 +26,6 @@
 
 #include "../src/defaults.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif // HAVE_SIGNAL_H