aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
authorSami Kerola <kerolasa@iki.fi>2013-02-12 22:05:45 (GMT)
committerSami Kerola <kerolasa@iki.fi>2013-05-26 09:38:10 (GMT)
commit73b79587708d49adfec3edb464fd0970fc9f9022 (patch)
tree17a8fd36635ccf8e56d5f4fa821678665348dab6 /src/FbTk
parentf5bfd27f524d33e9aebf502dc6c0e8ff316fed7c (diff)
downloadfluxbox-73b79587708d49adfec3edb464fd0970fc9f9022.zip
fluxbox-73b79587708d49adfec3edb464fd0970fc9f9022.tar.bz2
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.
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/FbString.hh1
-rw-r--r--src/FbTk/FbTime.hh6
-rw-r--r--src/FbTk/FbWindow.cc4
-rw-r--r--src/FbTk/FileUtil.hh3
-rw-r--r--src/FbTk/Font.cc4
-rw-r--r--src/FbTk/Font.hh4
-rw-r--r--src/FbTk/I18n.hh5
-rw-r--r--src/FbTk/Image.cc4
-rw-r--r--src/FbTk/ImageControl.cc5
-rw-r--r--src/FbTk/Makefile.am2
-rw-r--r--src/FbTk/Menu.cc4
-rw-r--r--src/FbTk/RegExp.hh4
-rw-r--r--src/FbTk/Shape.cc4
-rw-r--r--src/FbTk/ThemeItems.cc4
-rw-r--r--src/FbTk/Timer.hh4
-rw-r--r--src/FbTk/Transparent.cc4
-rw-r--r--src/FbTk/XftFontImp.cc4
-rw-r--r--src/FbTk/XmbFontImp.cc4
-rw-r--r--src/FbTk/stringstream.hh4
19 files changed, 1 insertions, 73 deletions
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 @@
25 25
26#include <string> 26#include <string>
27 27
28#include "config.h"
29#ifdef HAVE_ICONV 28#ifdef HAVE_ICONV
30#include <iconv.h> 29#include <iconv.h>
31#endif // HAVE_ICONV 30#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 @@
22#ifndef FBTK_FBTIME_HH 22#ifndef FBTK_FBTIME_HH
23#define FBTK_FBTIME_HH 23#define FBTK_FBTIME_HH
24 24
25
26#ifdef HAVE_CONFIG_H
27#include "config.h"
28#endif // HAVE_CONFIG_H
29
30
31#ifdef HAVE_INTTYPES_H 25#ifdef HAVE_INTTYPES_H
32#include <inttypes.h> 26#include <inttypes.h>
33#endif // HAVE_INTTYPES_H 27#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 @@
28#include "App.hh" 28#include "App.hh"
29#include "Transparent.hh" 29#include "Transparent.hh"
30 30
31#ifdef HAVE_CONFIG_H
32#include "config.h"
33#endif // HAVE_CONFIG_H
34
35#include <X11/Xutil.h> 31#include <X11/Xutil.h>
36#include <X11/Xatom.h> 32#include <X11/Xatom.h>
37 33
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 @@
22#ifndef FBTK_FILEUTIL_HH 22#ifndef FBTK_FILEUTIL_HH
23#define FBTK_FILEUTIL_HH 23#define FBTK_FILEUTIL_HH
24 24
25#ifdef HAVE_CONFIG_H
26#include "config.h"
27#endif // HAVE_CONFIG_H
28#ifdef HAVE_CTIME 25#ifdef HAVE_CTIME
29 #include <ctime> 26 #include <ctime>
30#else 27#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 @@
25#include "FontImp.hh" 25#include "FontImp.hh"
26#include "App.hh" 26#include "App.hh"
27 27
28#ifdef HAVE_CONFIG_H
29#include "config.h"
30#endif // HAVE_CONFIG_H
31
32// for antialias 28// for antialias
33#ifdef USE_XFT 29#ifdef USE_XFT
34#include "XftFontImp.hh" 30#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 @@
24 24
25#include <X11/Xlib.h> 25#include <X11/Xlib.h>
26 26
27#ifdef HAVE_CONFIG_H
28#include "config.h"
29#endif // HAVE_CONFIG_H
30
31#include "FbString.hh" 27#include "FbString.hh"
32#include "Color.hh" 28#include "Color.hh"
33#include "Orientation.hh" 29#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 @@
30 30
31#include "FbString.hh" 31#include "FbString.hh"
32 32
33#ifdef HAVE_CONFIG_H
34#include "config.h"
35#endif // HAVE_CONFIG_H
36
37
38#ifdef HAVE_LOCALE_H 33#ifdef HAVE_LOCALE_H
39#include <locale.h> 34#include <locale.h>
40#endif // HAVE_LOCALE_H 35#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 @@
23#include "StringUtil.hh" 23#include "StringUtil.hh"
24#include "FileUtil.hh" 24#include "FileUtil.hh"
25 25
26#ifdef HAVE_CONFIG_H
27#include "config.h"
28#endif // HAVE_CONFIG_H
29
30#ifdef HAVE_XPM 26#ifdef HAVE_XPM
31#include "ImageXPM.hh" 27#include "ImageXPM.hh"
32#endif // HAVE_XPM 28#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 @@
35#define _GNU_SOURCE 35#define _GNU_SOURCE
36#endif // _GNU_SOURCE 36#endif // _GNU_SOURCE
37 37
38
39#ifdef HAVE_CONFIG_H
40#include "config.h"
41#endif // HAVE_CONFIG_H
42
43#ifdef HAVE_SYS_TYPES_H 38#ifdef HAVE_SYS_TYPES_H
44#include <sys/types.h> 39#include <sys/types.h>
45#endif // HAVE_SYS_TYPES_H 40#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 @@
1noinst_LIBRARIES = libFbTk.a 1noinst_LIBRARIES = libFbTk.a
2 2
3AM_CPPFLAGS=@CPPFLAGS@ 3AM_CPPFLAGS=-include $(top_builddir)/config.h
4 4
5if XFT 5if XFT
6xft_SOURCE= XftFontImp.hh XftFontImp.cc 6xft_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 @@
29 29
30#include "Menu.hh" 30#include "Menu.hh"
31 31
32#ifdef HAVE_CONFIG_H
33#include "config.h"
34#endif //HAVE_CONFIG_H
35
36#include "MenuItem.hh" 32#include "MenuItem.hh"
37#include "MenuSeparator.hh" 33#include "MenuSeparator.hh"
38#include "ImageControl.hh" 34#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 @@
26 26
27#include "NotCopyable.hh" 27#include "NotCopyable.hh"
28 28
29#ifdef HAVE_CONFIG_H
30#include "config.h"
31#endif // HAVE_CONFIG_H
32
33#include <string> 29#include <string>
34 30
35/* 31/*
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 @@
26#include "GContext.hh" 26#include "GContext.hh"
27#include "FbPixmap.hh" 27#include "FbPixmap.hh"
28 28
29#ifdef HAVE_CONFIG_H
30#include "config.h"
31#endif // HAVE_CONFIG_H
32
33#ifdef HAVE_CSTRING 29#ifdef HAVE_CSTRING
34 #include <cstring> 30 #include <cstring>
35#else 31#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 @@
24#ifndef THEMEITEMS_HH 24#ifndef THEMEITEMS_HH
25#define THEMEITEMS_HH 25#define THEMEITEMS_HH
26 26
27#ifdef HAVE_CONFIG_H
28#include "config.h"
29#endif // HAVE_CONFIG_H
30
31#include "Theme.hh" 27#include "Theme.hh"
32#include "Color.hh" 28#include "Color.hh"
33#include "Texture.hh" 29#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 @@
29#include "Command.hh" 29#include "Command.hh"
30#include "FbTime.hh" 30#include "FbTime.hh"
31 31
32#ifdef HAVE_CONFIG_H
33#include "config.h"
34#endif //HAVE_CONFIG_H
35
36#include <string> 32#include <string>
37 33
38namespace FbTk { 34namespace 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 @@
23#include "App.hh" 23#include "App.hh"
24#include "I18n.hh" 24#include "I18n.hh"
25 25
26#ifdef HAVE_CONFIG_H
27#include "config.h"
28#endif // HAVE_CONFIG_H
29
30#ifdef HAVE_XRENDER 26#ifdef HAVE_XRENDER
31#include <X11/extensions/Xrender.h> 27#include <X11/extensions/Xrender.h>
32#endif // HAVE_XRENDER 28#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 @@
25 25
26#include <math.h> 26#include <math.h>
27 27
28#ifdef HAVE_CONFIG_H
29#include "config.h"
30#endif //HAVE_CONFIG_H
31
32namespace FbTk { 28namespace FbTk {
33 29
34XftFontImp::XftFontImp(const char *name, bool utf8): 30XftFontImp::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 @@
27#include "FbPixmap.hh" 27#include "FbPixmap.hh"
28#include "GContext.hh" 28#include "GContext.hh"
29 29
30#ifdef HAVE_CONFIG_H
31#include "config.h"
32#endif //HAVE_CONFIG_H
33
34#ifdef HAVE_SETLOCALE 30#ifdef HAVE_SETLOCALE
35#include <locale.h> 31#include <locale.h>
36#endif // HAVE_SETLOCALE 32#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 @@
22#ifndef FBTK_STRINGSTREAM_HH 22#ifndef FBTK_STRINGSTREAM_HH
23#define FBTK_STRINGSTREAM_HH 23#define FBTK_STRINGSTREAM_HH
24 24
25#ifdef HAVE_CONFIG_H
26#include "config.h"
27#endif // HAVE_CONFIG_H
28
29#ifdef HAVE_SSTREAM 25#ifdef HAVE_SSTREAM
30#include <sstream> 26#include <sstream>
31#define FbTk_istringstream std::istringstream 27#define FbTk_istringstream std::istringstream