From 73b79587708d49adfec3edb464fd0970fc9f9022 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Tue, 12 Feb 2013 22:05:45 +0000 Subject: 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. --- src/ClockTool.cc | 4 ---- src/CurrentWindowCmd.cc | 4 ---- src/Debug.hh | 1 - src/FbCommands.cc | 5 ----- src/FbTk/FbString.hh | 1 - src/FbTk/FbTime.hh | 6 ------ src/FbTk/FbWindow.cc | 4 ---- src/FbTk/FileUtil.hh | 3 --- src/FbTk/Font.cc | 4 ---- src/FbTk/Font.hh | 4 ---- src/FbTk/I18n.hh | 5 ----- src/FbTk/Image.cc | 4 ---- src/FbTk/ImageControl.cc | 5 ----- src/FbTk/Makefile.am | 2 +- src/FbTk/Menu.cc | 4 ---- src/FbTk/RegExp.hh | 4 ---- src/FbTk/Shape.cc | 4 ---- src/FbTk/ThemeItems.cc | 4 ---- src/FbTk/Timer.hh | 4 ---- src/FbTk/Transparent.cc | 4 ---- src/FbTk/XftFontImp.cc | 4 ---- src/FbTk/XmbFontImp.cc | 4 ---- src/FbTk/stringstream.hh | 4 ---- src/IconButton.cc | 4 ---- src/Keys.cc | 5 ----- src/Makefile.am | 2 +- src/Screen.cc | 4 ---- src/Slit.cc | 4 ---- src/Toolbar.cc | 4 ---- src/Window.cc | 3 --- src/WindowState.cc | 4 ---- src/Workspace.cc | 4 ---- src/fluxbox.cc | 4 ---- src/fluxbox.hh | 4 ---- src/main.cc | 4 ---- src/tests/Makefile.am | 2 +- util/Makefile.am | 6 +++--- util/fbrun/FbRun.cc | 4 ---- util/fbrun/Makefile.am | 2 +- util/fbsetroot.cc | 4 ---- util/fluxbox-update_configs.cc | 4 ---- 41 files changed, 7 insertions(+), 149 deletions(-) diff --git a/src/ClockTool.cc b/src/ClockTool.cc index b6d343f..0812092 100644 --- a/src/ClockTool.cc +++ b/src/ClockTool.cc @@ -37,10 +37,6 @@ #include "FbTk/I18n.hh" #include "FbTk/FbTime.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #ifdef HAVE_CTIME #include #else diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc index 6138e64..0d2e12f 100644 --- a/src/CurrentWindowCmd.cc +++ b/src/CurrentWindowCmd.cc @@ -39,10 +39,6 @@ #include "FbTk/Util.hh" #include "FbTk/RelCalcHelper.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #ifdef HAVE_CSTDLIB #include #else diff --git a/src/Debug.hh b/src/Debug.hh index 3688b52..59072e8 100644 --- a/src/Debug.hh +++ b/src/Debug.hh @@ -1,7 +1,6 @@ #ifndef DEBUG_HH #define DEBUG_HH -#include "config.h" #include #ifdef DEBUG diff --git a/src/FbCommands.cc b/src/FbCommands.cc index eb7fbfd..c8cf4ae 100644 --- a/src/FbCommands.cc +++ b/src/FbCommands.cc @@ -54,11 +54,6 @@ #include #endif - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #if defined(__EMX__) && defined(HAVE_PROCESS_H) #include // for P_NOWAIT #endif // __EMX__ diff --git a/src/FbTk/FbString.hh b/src/FbTk/FbString.hh index 4f3e792..750014d 100644 --- a/src/FbTk/FbString.hh +++ b/src/FbTk/FbString.hh @@ -25,7 +25,6 @@ #include -#include "config.h" #ifdef HAVE_ICONV #include #endif // HAVE_ICONV diff --git a/src/FbTk/FbTime.hh b/src/FbTk/FbTime.hh index 3d80b12..42ee912 100644 --- a/src/FbTk/FbTime.hh +++ b/src/FbTk/FbTime.hh @@ -22,12 +22,6 @@ #ifndef FBTK_FBTIME_HH #define FBTK_FBTIME_HH - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - - #ifdef HAVE_INTTYPES_H #include #endif // HAVE_INTTYPES_H diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc index 257447f..4582574 100644 --- a/src/FbTk/FbWindow.cc +++ b/src/FbTk/FbWindow.cc @@ -28,10 +28,6 @@ #include "App.hh" #include "Transparent.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #include #include diff --git a/src/FbTk/FileUtil.hh b/src/FbTk/FileUtil.hh index d031a6e..fbc8ceb 100644 --- a/src/FbTk/FileUtil.hh +++ b/src/FbTk/FileUtil.hh @@ -22,9 +22,6 @@ #ifndef FBTK_FILEUTIL_HH #define FBTK_FILEUTIL_HH -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H #ifdef HAVE_CTIME #include #else diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc index 544ddc2..5987134 100644 --- a/src/FbTk/Font.cc +++ b/src/FbTk/Font.cc @@ -25,10 +25,6 @@ #include "FontImp.hh" #include "App.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - // for antialias #ifdef USE_XFT #include "XftFontImp.hh" diff --git a/src/FbTk/Font.hh b/src/FbTk/Font.hh index 6ea2571..8a0f05d 100644 --- a/src/FbTk/Font.hh +++ b/src/FbTk/Font.hh @@ -24,10 +24,6 @@ #include -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #include "FbString.hh" #include "Color.hh" #include "Orientation.hh" diff --git a/src/FbTk/I18n.hh b/src/FbTk/I18n.hh index 0413f74..4ff4b77 100644 --- a/src/FbTk/I18n.hh +++ b/src/FbTk/I18n.hh @@ -30,11 +30,6 @@ #include "FbString.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - - #ifdef HAVE_LOCALE_H #include #endif // HAVE_LOCALE_H diff --git a/src/FbTk/Image.cc b/src/FbTk/Image.cc index 1cf94fa..f1bca2c 100644 --- a/src/FbTk/Image.cc +++ b/src/FbTk/Image.cc @@ -23,10 +23,6 @@ #include "StringUtil.hh" #include "FileUtil.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #ifdef HAVE_XPM #include "ImageXPM.hh" #endif // HAVE_XPM diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc index c99ef9a..8b5f23d 100644 --- a/src/FbTk/ImageControl.cc +++ b/src/FbTk/ImageControl.cc @@ -35,11 +35,6 @@ #define _GNU_SOURCE #endif // _GNU_SOURCE - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #ifdef HAVE_SYS_TYPES_H #include #endif // HAVE_SYS_TYPES_H diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am index d54eaae..3c34b22 100644 --- a/src/FbTk/Makefile.am +++ b/src/FbTk/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libFbTk.a -AM_CPPFLAGS=@CPPFLAGS@ +AM_CPPFLAGS=-include $(top_builddir)/config.h if XFT xft_SOURCE= XftFontImp.hh XftFontImp.cc diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc index 3632fc9..3e3481f 100644 --- a/src/FbTk/Menu.cc +++ b/src/FbTk/Menu.cc @@ -29,10 +29,6 @@ #include "Menu.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif //HAVE_CONFIG_H - #include "MenuItem.hh" #include "MenuSeparator.hh" #include "ImageControl.hh" diff --git a/src/FbTk/RegExp.hh b/src/FbTk/RegExp.hh index 47d2cd5..b3106c0 100644 --- a/src/FbTk/RegExp.hh +++ b/src/FbTk/RegExp.hh @@ -26,10 +26,6 @@ #include "NotCopyable.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #include /* diff --git a/src/FbTk/Shape.cc b/src/FbTk/Shape.cc index 32745af..806828f 100644 --- a/src/FbTk/Shape.cc +++ b/src/FbTk/Shape.cc @@ -26,10 +26,6 @@ #include "GContext.hh" #include "FbPixmap.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #ifdef HAVE_CSTRING #include #else diff --git a/src/FbTk/ThemeItems.cc b/src/FbTk/ThemeItems.cc index 774a14d..b1f9a60 100644 --- a/src/FbTk/ThemeItems.cc +++ b/src/FbTk/ThemeItems.cc @@ -24,10 +24,6 @@ #ifndef THEMEITEMS_HH #define THEMEITEMS_HH -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #include "Theme.hh" #include "Color.hh" #include "Texture.hh" diff --git a/src/FbTk/Timer.hh b/src/FbTk/Timer.hh index b4ce55e..4bdd13a 100644 --- a/src/FbTk/Timer.hh +++ b/src/FbTk/Timer.hh @@ -29,10 +29,6 @@ #include "Command.hh" #include "FbTime.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif //HAVE_CONFIG_H - #include namespace FbTk { diff --git a/src/FbTk/Transparent.cc b/src/FbTk/Transparent.cc index 04fee67..7db207a 100644 --- a/src/FbTk/Transparent.cc +++ b/src/FbTk/Transparent.cc @@ -23,10 +23,6 @@ #include "App.hh" #include "I18n.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #ifdef HAVE_XRENDER #include #endif // HAVE_XRENDER diff --git a/src/FbTk/XftFontImp.cc b/src/FbTk/XftFontImp.cc index 15c8212..6568457 100644 --- a/src/FbTk/XftFontImp.cc +++ b/src/FbTk/XftFontImp.cc @@ -25,10 +25,6 @@ #include -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif //HAVE_CONFIG_H - namespace FbTk { XftFontImp::XftFontImp(const char *name, bool utf8): diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc index 34abee9..6370d86 100644 --- a/src/FbTk/XmbFontImp.cc +++ b/src/FbTk/XmbFontImp.cc @@ -27,10 +27,6 @@ #include "FbPixmap.hh" #include "GContext.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif //HAVE_CONFIG_H - #ifdef HAVE_SETLOCALE #include #endif // HAVE_SETLOCALE diff --git a/src/FbTk/stringstream.hh b/src/FbTk/stringstream.hh index 54bd6f0..31560c9 100644 --- a/src/FbTk/stringstream.hh +++ b/src/FbTk/stringstream.hh @@ -22,10 +22,6 @@ #ifndef FBTK_STRINGSTREAM_HH #define FBTK_STRINGSTREAM_HH -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #ifdef HAVE_SSTREAM #include #define FbTk_istringstream std::istringstream diff --git a/src/IconButton.cc b/src/IconButton.cc index 7c70a63..f7b4f5f 100644 --- a/src/IconButton.cc +++ b/src/IconButton.cc @@ -32,10 +32,6 @@ #include "FbTk/ImageControl.hh" #include "FbTk/TextUtils.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #include #ifdef SHAPE #include diff --git a/src/Keys.cc b/src/Keys.cc index 388ec52..79b0403 100644 --- a/src/Keys.cc +++ b/src/Keys.cc @@ -40,11 +40,6 @@ #include "FbTk/AutoReloadHelper.hh" #include "FbTk/STLUtil.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - - #ifdef HAVE_CCTYPE #include #else diff --git a/src/Makefile.am b/src/Makefile.am index 257bdbb..966546c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -38,7 +38,7 @@ DEFAULT_WINDOWMENU=@DEFAULT_WINDOWMENU@ PROGRAM_PREFIX=@program_prefix@ PROGRAM_SUFFIX=@program_suffix@ -AM_CPPFLAGS= +AM_CPPFLAGS=-include $(top_builddir)/config.h bin_PROGRAMS= fluxbox BUILT_SOURCES = defaults.hh defaults.cc diff --git a/src/Screen.cc b/src/Screen.cc index 366b8df..9bf8e40 100644 --- a/src/Screen.cc +++ b/src/Screen.cc @@ -82,10 +82,6 @@ #define _GNU_SOURCE #endif // _GNU_SOURCE -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #ifdef USE_SLIT #include "Slit.hh" #include "SlitClient.hh" diff --git a/src/Slit.cc b/src/Slit.cc index 7d6b1ef..47cd11f 100644 --- a/src/Slit.cc +++ b/src/Slit.cc @@ -29,10 +29,6 @@ #define _GNU_SOURCE #endif // _GNU_SOURCE -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #include "Screen.hh" #include "ScreenPlacement.hh" #include "FbTk/ImageControl.hh" diff --git a/src/Toolbar.cc b/src/Toolbar.cc index 4300790..775bf39 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc @@ -60,10 +60,6 @@ #define _GNU_SOURCE #endif // _GNU_SOURCE -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #include #include diff --git a/src/Window.cc b/src/Window.cc index c09cc24..4c81124 100644 --- a/src/Window.cc +++ b/src/Window.cc @@ -55,9 +55,6 @@ #include "FbTk/Select2nd.hh" #include "FbTk/MemFun.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H #ifdef SHAPE #include #endif // SHAPE diff --git a/src/WindowState.cc b/src/WindowState.cc index b2c76b0..2f1ee0e 100644 --- a/src/WindowState.cc +++ b/src/WindowState.cc @@ -23,10 +23,6 @@ #include "FbTk/StringUtil.hh" -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #ifdef HAVE_CSTDLIB #include #else diff --git a/src/Workspace.cc b/src/Workspace.cc index a162b4c..6a721cb 100644 --- a/src/Workspace.cc +++ b/src/Workspace.cc @@ -41,10 +41,6 @@ #define _GNU_SOURCE #endif // _GNU_SOURCE -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #include #include diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 4ef6a67..cec46eb 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc @@ -62,10 +62,6 @@ #define _GNU_SOURCE #endif // _GNU_SOURCE -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #ifdef USE_EWMH #include "Ewmh.hh" #endif // USE_EWMH diff --git a/src/fluxbox.hh b/src/fluxbox.hh index f83934a..58cf664 100644 --- a/src/fluxbox.hh +++ b/src/fluxbox.hh @@ -41,10 +41,6 @@ #include #endif -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #ifdef TIME_WITH_SYS_TIME #include #include diff --git a/src/main.cc b/src/main.cc index 0639e30..bcd31db 100644 --- a/src/main.cc +++ b/src/main.cc @@ -20,10 +20,6 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif // HAVE_CONFIG_H - #include "fluxbox.hh" #include "version.h" #include "defaults.hh" diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 6b3809d..62d7604 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS= -I$(top_srcdir)/src +AM_CPPFLAGS= -I$(top_srcdir)/src -include $(top_builddir)/config.h noinst_PROGRAMS= \ testTexture \ 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 #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 #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 #endif // HAVE_SIGNAL_H -- cgit v0.11.2