diff options
author | Sami Kerola <kerolasa@iki.fi> | 2013-02-12 22:05:45 (GMT) |
---|---|---|
committer | Sami Kerola <kerolasa@iki.fi> | 2013-05-26 09:38:10 (GMT) |
commit | 73b79587708d49adfec3edb464fd0970fc9f9022 (patch) | |
tree | 17a8fd36635ccf8e56d5f4fa821678665348dab6 /util/fbrun | |
parent | f5bfd27f524d33e9aebf502dc6c0e8ff316fed7c (diff) | |
download | fluxbox-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 'util/fbrun')
-rw-r--r-- | util/fbrun/FbRun.cc | 4 | ||||
-rw-r--r-- | util/fbrun/Makefile.am | 2 |
2 files changed, 1 insertions, 5 deletions
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 @@ | |||
27 | #include "FbTk/KeyUtil.hh" | 27 | #include "FbTk/KeyUtil.hh" |
28 | #include "FbTk/FileUtil.hh" | 28 | #include "FbTk/FileUtil.hh" |
29 | 29 | ||
30 | #ifdef HAVE_CONFIG_H | ||
31 | #include "config.h" | ||
32 | #endif // HAVE_CONFIG_H | ||
33 | |||
34 | #ifdef HAVE_XPM | 30 | #ifdef HAVE_XPM |
35 | #include <X11/xpm.h> | 31 | #include <X11/xpm.h> |
36 | #include "fbrun.xpm" | 32 | #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 @@ | |||
1 | FLUXBOX_SRC_DIR= ../../src/ | 1 | FLUXBOX_SRC_DIR= ../../src/ |
2 | AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk | 2 | AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk -include $(top_builddir)/config.h |
3 | bin_PROGRAMS= fbrun | 3 | bin_PROGRAMS= fbrun |
4 | fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm | 4 | fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm |
5 | fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a | 5 | fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a |