all repos — fluxbox @ 73b79587708d49adfec3edb464fd0970fc9f9022

custom fork of the fluxbox windowmanager 

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.
Sami Kerola kerolasa@iki.fi
commit

73b79587708d49adfec3edb464fd0970fc9f9022

parent

f5bfd27f524d33e9aebf502dc6c0e8ff316fed7c

41 files changed, 7 insertions(+), 149 deletions(-)

jump to
M src/ClockTool.cc → src/ClockTool.cc 
@@ -37,10 +37,6 @@ #include "FbTk/MenuItem.hh"
 #include "FbTk/I18n.hh"
 #include "FbTk/FbTime.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CTIME
   #include <ctime>
 #else
M src/CurrentWindowCmd.cc → src/CurrentWindowCmd.cc 
@@ -39,10 +39,6 @@ #include "FbTk/StringUtil.hh"
 #include "FbTk/Util.hh"
 #include "FbTk/RelCalcHelper.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CSTDLIB
 #include <cstdlib>
 #else
M src/Debug.hh → src/Debug.hh 
@@ -1,7 +1,6 @@ 
 #ifndef DEBUG_HH
 #define DEBUG_HH
 
-#include "config.h"
 #include <iostream>
 
 #ifdef DEBUG
M src/FbCommands.cc → src/FbCommands.cc 
@@ -54,11 +54,6 @@ #else
   #include <string.h>
 #endif
 
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #if defined(__EMX__) && defined(HAVE_PROCESS_H)
 #include <process.h> // for P_NOWAIT
 #endif // __EMX__
M src/FbTk/FbString.hh → src/FbTk/FbString.hh 
@@ -25,7 +25,6 @@ #define FBTK_FBSTRING_HH
 
 #include <string>
 
-#include "config.h"
 #ifdef HAVE_ICONV
 #include <iconv.h>
 #endif // HAVE_ICONV
M src/FbTk/FbTime.hh → 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 <inttypes.h>
 #endif // HAVE_INTTYPES_H
M src/FbTk/FbWindow.cc → src/FbTk/FbWindow.cc 
@@ -28,10 +28,6 @@ #include "Color.hh"
 #include "App.hh"
 #include "Transparent.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
M src/FbTk/FileUtil.hh → 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 <ctime>
 #else
M src/FbTk/Font.cc → src/FbTk/Font.cc 
@@ -25,10 +25,6 @@ #include "Font.hh"
 #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"
M src/FbTk/Font.hh → src/FbTk/Font.hh 
@@ -24,10 +24,6 @@ #define FBTK_FONT_HH
 
 #include <X11/Xlib.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include "FbString.hh"
 #include "Color.hh"
 #include "Orientation.hh"
M src/FbTk/I18n.hh → src/FbTk/I18n.hh 
@@ -30,11 +30,6 @@ #include "../../nls/fluxbox-nls.hh"
 
 #include "FbString.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
-
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif // HAVE_LOCALE_H
M src/FbTk/Image.cc → src/FbTk/Image.cc 
@@ -23,10 +23,6 @@ #include "Image.hh"
 #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
M src/FbTk/ImageControl.cc → src/FbTk/ImageControl.cc 
@@ -35,11 +35,6 @@ #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif // _GNU_SOURCE
 
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif // HAVE_SYS_TYPES_H
M src/FbTk/Makefile.am → 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
M src/FbTk/Menu.cc → src/FbTk/Menu.cc 
@@ -29,10 +29,6 @@ #endif // _GNU_SOURCE
 
 #include "Menu.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 #include "MenuItem.hh"
 #include "MenuSeparator.hh"
 #include "ImageControl.hh"
M src/FbTk/RegExp.hh → src/FbTk/RegExp.hh 
@@ -26,10 +26,6 @@ #define FBTK_REGEXP_HH
 
 #include "NotCopyable.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <string>
 
 /*
M src/FbTk/Shape.cc → src/FbTk/Shape.cc 
@@ -26,10 +26,6 @@ #include "App.hh"
 #include "GContext.hh"
 #include "FbPixmap.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CSTRING
   #include <cstring>
 #else
M src/FbTk/ThemeItems.cc → 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"
M src/FbTk/Timer.hh → src/FbTk/Timer.hh 
@@ -29,10 +29,6 @@ #include "RefCount.hh"
 #include "Command.hh"
 #include "FbTime.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 #include <string>
 
 namespace FbTk {
M src/FbTk/Transparent.cc → src/FbTk/Transparent.cc 
@@ -23,10 +23,6 @@ #include "Transparent.hh"
 #include "App.hh"
 #include "I18n.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_XRENDER
 #include <X11/extensions/Xrender.h>
 #endif // HAVE_XRENDER
M src/FbTk/XftFontImp.cc → src/FbTk/XftFontImp.cc 
@@ -25,10 +25,6 @@ #include "FbDrawable.hh"
 
 #include <math.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 namespace FbTk {
 
 XftFontImp::XftFontImp(const char *name, bool utf8):
M src/FbTk/XmbFontImp.cc → src/FbTk/XmbFontImp.cc 
@@ -27,10 +27,6 @@ #include "StringUtil.hh"
 #include "FbPixmap.hh"
 #include "GContext.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 #ifdef HAVE_SETLOCALE
 #include <locale.h>
 #endif // HAVE_SETLOCALE
M src/FbTk/stringstream.hh → 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 <sstream>
 #define FbTk_istringstream std::istringstream
M src/IconButton.cc → src/IconButton.cc 
@@ -32,10 +32,6 @@ #include "FbTk/EventManager.hh"
 #include "FbTk/ImageControl.hh"
 #include "FbTk/TextUtils.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xutil.h>
 #ifdef SHAPE
 #include <X11/extensions/shape.h>
M src/Keys.cc → src/Keys.cc 
@@ -40,11 +40,6 @@ #include "FbTk/I18n.hh"
 #include "FbTk/AutoReloadHelper.hh"
 #include "FbTk/STLUtil.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
-
 #ifdef HAVE_CCTYPE
   #include <cctype>
 #else
M src/Makefile.am → 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
M src/Screen.cc → src/Screen.cc 
@@ -82,10 +82,6 @@ #ifndef _GNU_SOURCE
 #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"
M src/Slit.cc → src/Slit.cc 
@@ -29,10 +29,6 @@ #ifndef	 _GNU_SOURCE
 #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"
M src/Toolbar.cc → src/Toolbar.cc 
@@ -60,10 +60,6 @@ #ifndef	 _GNU_SOURCE
 #define	 _GNU_SOURCE
 #endif // _GNU_SOURCE
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
M src/Window.cc → src/Window.cc 
@@ -55,9 +55,6 @@ #include "FbTk/SimpleCommand.hh"
 #include "FbTk/Select2nd.hh"
 #include "FbTk/MemFun.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
 #ifdef SHAPE
 #include <X11/extensions/shape.h>
 #endif // SHAPE
M src/WindowState.cc → src/WindowState.cc 
@@ -23,10 +23,6 @@ #include "WindowState.hh"
 
 #include "FbTk/StringUtil.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CSTDLIB
   #include <cstdlib>
 #else
M src/Workspace.cc → src/Workspace.cc 
@@ -41,10 +41,6 @@ #ifndef  _GNU_SOURCE
 #define  _GNU_SOURCE
 #endif // _GNU_SOURCE
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
M src/fluxbox.cc → src/fluxbox.cc 
@@ -62,10 +62,6 @@ #ifndef	 _GNU_SOURCE
 #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
M src/fluxbox.hh → src/fluxbox.hh 
@@ -41,10 +41,6 @@ #else
   #include <stdio.h>
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
M src/main.cc → src/main.cc 
@@ -20,10 +20,6 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // 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"
M src/tests/Makefile.am → 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 \
M util/Makefile.am → 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 @@ 
 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
M util/fbrun/FbRun.cc → util/fbrun/FbRun.cc 
@@ -27,10 +27,6 @@ #include "FbTk/Color.hh"
 #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"
M util/fbrun/Makefile.am → 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
M util/fbsetroot.cc → util/fbsetroot.cc 
@@ -26,10 +26,6 @@ #include "../src/FbTk/Texture.hh"
 #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
M util/fluxbox-update_configs.cc → util/fluxbox-update_configs.cc 
@@ -26,10 +26,6 @@ #include "../src/FbTk/FileUtil.hh"
 
 #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