aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/Makefile.am6
-rw-r--r--util/fbrun/FbRun.cc4
-rw-r--r--util/fbrun/Makefile.am2
-rw-r--r--util/fbsetroot.cc4
-rw-r--r--util/fluxbox-update_configs.cc4
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
2SUBDIRS= fbrun 2SUBDIRS= fbrun
3AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk 3AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk -include $(top_builddir)/config.h
4bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox 4bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox
5bin_PROGRAMS= fbsetroot fluxbox-update_configs fluxbox-remote 5bin_PROGRAMS= fbsetroot fluxbox-update_configs fluxbox-remote
6fbsetroot_SOURCES= fbsetroot.cc fbsetroot.hh 6fbsetroot_SOURCES= fbsetroot.cc fbsetroot.hh
@@ -23,10 +23,10 @@ all-local: startfluxbox
23clean-local: 23clean-local:
24 rm -f startfluxbox fluxbox-generate_menu 24 rm -f startfluxbox fluxbox-generate_menu
25 25
26fbsetroot.o: fbsetroot.cc ../config.h $(srcdir)/fbsetroot.hh \ 26fbsetroot.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
29fluxbox-update_configs.o: fluxbox-update_configs.cc ../config.h \ 29fluxbox-update_configs.o: fluxbox-update_configs.cc \
30 $(top_builddir)/src/defaults.hh 30 $(top_builddir)/src/defaults.hh
31 31
32fluxbox-remote.o: fluxbox-remote.cc 32fluxbox-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 @@
1FLUXBOX_SRC_DIR= ../../src/ 1FLUXBOX_SRC_DIR= ../../src/
2AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk 2AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk -include $(top_builddir)/config.h
3bin_PROGRAMS= fbrun 3bin_PROGRAMS= fbrun
4fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm 4fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm
5fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a 5fbrun_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