diff options
Diffstat (limited to 'util')
-rw-r--r-- | util/Makefile.am | 6 | ||||
-rw-r--r-- | util/fbrun/FbRun.cc | 4 | ||||
-rw-r--r-- | util/fbrun/Makefile.am | 2 | ||||
-rw-r--r-- | util/fbsetroot.cc | 4 | ||||
-rw-r--r-- | util/fluxbox-update_configs.cc | 4 |
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 @@ | |||
1 | # util/Makefile.am for Fluxbox | 1 | # util/Makefile.am for Fluxbox |
2 | SUBDIRS= fbrun | 2 | SUBDIRS= fbrun |
3 | AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk | 3 | AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk -include $(top_builddir)/config.h |
4 | bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox | 4 | bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox |
5 | bin_PROGRAMS= fbsetroot fluxbox-update_configs fluxbox-remote | 5 | bin_PROGRAMS= fbsetroot fluxbox-update_configs fluxbox-remote |
6 | fbsetroot_SOURCES= fbsetroot.cc fbsetroot.hh | 6 | fbsetroot_SOURCES= fbsetroot.cc fbsetroot.hh |
@@ -23,10 +23,10 @@ all-local: startfluxbox | |||
23 | clean-local: | 23 | clean-local: |
24 | rm -f startfluxbox fluxbox-generate_menu | 24 | rm -f startfluxbox fluxbox-generate_menu |
25 | 25 | ||
26 | fbsetroot.o: fbsetroot.cc ../config.h $(srcdir)/fbsetroot.hh \ | 26 | fbsetroot.o: fbsetroot.cc $(srcdir)/fbsetroot.hh \ |
27 | $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh | 27 | $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh |
28 | 28 | ||
29 | fluxbox-update_configs.o: fluxbox-update_configs.cc ../config.h \ | 29 | fluxbox-update_configs.o: fluxbox-update_configs.cc \ |
30 | $(top_builddir)/src/defaults.hh | 30 | $(top_builddir)/src/defaults.hh |
31 | 31 | ||
32 | fluxbox-remote.o: fluxbox-remote.cc | 32 | 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 @@ | |||
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 |
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 @@ | |||
26 | #include "../src/FbTk/GContext.hh" | 26 | #include "../src/FbTk/GContext.hh" |
27 | #include "../src/FbRootWindow.hh" | 27 | #include "../src/FbRootWindow.hh" |
28 | 28 | ||
29 | #ifdef HAVE_CONFIG_H | ||
30 | #include "config.h" | ||
31 | #endif // HAVE_CONFIG_H | ||
32 | |||
33 | #include <X11/Xatom.h> | 29 | #include <X11/Xatom.h> |
34 | 30 | ||
35 | #ifdef HAVE_CSTRING | 31 | #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 @@ | |||
26 | 26 | ||
27 | #include "../src/defaults.hh" | 27 | #include "../src/defaults.hh" |
28 | 28 | ||
29 | #ifdef HAVE_CONFIG_H | ||
30 | #include "config.h" | ||
31 | #endif // HAVE_CONFIG_H | ||
32 | |||
33 | #ifdef HAVE_SIGNAL_H | 29 | #ifdef HAVE_SIGNAL_H |
34 | #include <signal.h> | 30 | #include <signal.h> |
35 | #endif // HAVE_SIGNAL_H | 31 | #endif // HAVE_SIGNAL_H |