merge Sami Kerola's new build-system

7 files changed, 80 insertions, 84 deletions

diff --git a/util/Makefile.am b/util/Makefile.am
deleted file mode 100644
index f47924f..0000000
--- a/util/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-# util/Makefile.am for Fluxbox
-SUBDIRS=                fbrun
-AM_CPPFLAGS=            -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
-bin_SCRIPTS=            fbsetbg fluxbox-generate_menu startfluxbox
-bin_PROGRAMS=           fbsetroot fluxbox-update_configs fluxbox-remote
-fbsetroot_SOURCES=      fbsetroot.cc fbsetroot.hh
-fbsetroot_LDADD=../src/FbRootWindow.o ../src/FbAtoms.o \
-                        ../src/FbTk/libFbTk.a
-fluxbox_update_configs_SOURCES= fluxbox-update_configs.cc
-fluxbox_update_configs_LDADD=   ../src/defaults.o ../src/Resources.o \
-                        ../src/FbTk/libFbTk.a
-fluxbox_remote_SOURCES= fluxbox-remote.cc
-
-MAINTAINERCLEANFILES=   Makefile.in
-EXTRA_DIST=             fbsetbg fluxbox-generate_menu.in \
-                                startfluxbox.in
-
-PROGRAM_PREFIX=@program_prefix@
-PROGRAM_SUFFIX=@program_suffix@
-
-all-local:      startfluxbox
-
-clean-local:
-                rm -f startfluxbox fluxbox-generate_menu
-
-fbsetroot.o:    fbsetroot.cc ../config.h $(srcdir)/fbsetroot.hh \
-                        $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh
-
-fluxbox-update_configs.o:       fluxbox-update_configs.cc ../config.h \
-                        $(top_builddir)/src/defaults.hh
-
-fluxbox-remote.o:       fluxbox-remote.cc
-
-startfluxbox:   startfluxbox.in
-                @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
-                            -e "s,@pkgbindir@,$(bindir),g" \
-                            -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-                            -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
-                            -e "s,@EXEEXT@,$(EXEEXT),g" \
-                                $(srcdir)/startfluxbox.in > startfluxbox
-                -chmod 755 startfluxbox
-
-fluxbox-generate_menu: fluxbox-generate_menu.in
-                @regex_cmd@ -e "s,@PREFIX@,$(prefix),g" \
-                            -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-                            -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
-                            -e "s,@EXEEXT@,$(EXEEXT),g" \
-                                $(srcdir)/fluxbox-generate_menu.in \
-                                > fluxbox-generate_menu
-                -chmod 755 fluxbox-generate_menu
-
-../src/FbRootWindow.o:
-        cd ../src && ${MAKE} FbRootWindow.o
-../src/FbAtoms.o:
-        cd ../src && ${MAKE} FbAtoms.o
-../src/defaults.o:
-        cd ../src && ${MAKE} defaults.o
-../src/Resources.o:
-        cd ../src && ${MAKE} Resources.o
diff --git a/util/Makemodule.am b/util/Makemodule.am
new file mode 100644
index 0000000..44f3002
--- /dev/null
+++ b/util/Makemodule.am
@@ -0,0 +1,58 @@
+# util/Makefile.am for Fluxbox
+
+bin_SCRIPTS = \
+        util/fbsetbg \
+        util/fluxbox-generate_menu \
+        util/startfluxbox
+EXTRA_DIST += \
+        util/fbsetbg
+PATHFILES += \
+        util/startfluxbox \
+        util/fluxbox-generate_menu
+
+bin_PROGRAMS += \
+        fbsetroot \
+        fluxbox-remote \
+        fluxbox-update_configs
+
+fbsetroot_SOURCES = \
+        src/FbAtoms.cc \
+        src/FbRootWindow.cc \
+        util/fbsetroot.cc \
+        util/fbsetroot.hh
+fbsetroot_LDADD = \
+        libFbTk.a
+fbsetroot_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(fbtk_incdir) \
+        -I$(src_incdir) \
+        -I$(nls_incdir)
+fbsetroot_LDFLAGS = \
+        $(FONTCONFIG_LIBS) \
+        $(FRIBIDI_LIBS) \
+        $(X11_LIBS) \
+        $(XFT_LIBS) \
+        $(XRENDER_LIBS)
+
+fluxbox_update_configs_SOURCES = \
+        src/defaults.cc \
+        src/Resources.cc \
+        util/fluxbox-update_configs.cc
+fluxbox_update_configs_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(fbtk_incdir) \
+        -I$(src_incdir) \
+        -I$(nls_incdir)
+fluxbox_update_configs_LDADD = \
+        libFbTk.a
+fluxbox_update_configs_LDFLAGS = \
+        $(FRIBIDI_LIBS) \
+        $(X11_LIBS)
+
+fluxbox_remote_SOURCES = \
+        util/fluxbox-remote.cc
+fluxbox_remote_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(fbtk_incdir)
+fluxbox_remote_LDFLAGS = \
+        $(X11_LIBS)
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 @@
 #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"
diff --git a/util/fbrun/Makefile.am b/util/fbrun/Makefile.am
deleted file mode 100644
index 35317df..0000000
--- a/util/fbrun/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-FLUXBOX_SRC_DIR=        ../../src/
-AM_CPPFLAGS=            -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
-bin_PROGRAMS=           fbrun
-fbrun_SOURCES=          FbRun.hh FbRun.cc main.cc fbrun.xpm
-fbrun_LDADD=            ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a
-
-${FLUXBOX_SRC_DIR}FbTk/libFbTk.a:
-        cd ${FLUXBOX_SRC_DIR}FbTk && make
diff --git a/util/fbrun/Makemodule.am b/util/fbrun/Makemodule.am
new file mode 100644
index 0000000..f730ac8
--- /dev/null
+++ b/util/fbrun/Makemodule.am
@@ -0,0 +1,22 @@
+bin_PROGRAMS += fbrun
+
+fbrun_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(src_incdir)
+
+fbrun_SOURCES = \
+        util/fbrun/FbRun.hh \
+        util/fbrun/FbRun.cc \
+        util/fbrun/main.cc \
+        util/fbrun/fbrun.xpm
+
+fbrun_LDADD = libFbTk.a
+
+fbrun_LDFLAGS = \
+        $(FONTCONFIG_LIBS) \
+        $(FRIBIDI_LIBS) \
+        $(X11_LIBS) \
+        $(XFT_LIBS) \
+        $(XINERAMA_LIBS) \
+        $(XPM_LIBS) \
+        $(XRENDER_LIBS)
diff --git a/util/fbsetroot.cc b/util/fbsetroot.cc
index 99139bb..3a2f2b9 100644
--- a/util/fbsetroot.cc
+++ b/util/fbsetroot.cc
@@ -26,10 +26,6 @@
 #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
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index 8eff8e4..164b073 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -26,19 +26,10 @@
 
 #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
 
-//use GNU extensions
-#ifndef         _GNU_SOURCE
-#define         _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #ifdef HAVE_CSTRING
   #include <cstring>
 #else