merge Sami Kerola's new build-system

2014-04-11 17:42:09 +02:00 · 2014-04-11 17:42:09 +02:00 · e105de7d46
commit e105de7d46
parent bc272ba4ae 7541054b29
107 changed files with 3436 additions and 2051 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,21 +3,23 @@

 # Exact filename in any subdir.
 .deps
+.dirstamp
 Makefile
 Makefile.in

 # Exact wildcard, e.g., not in subdirs.
-/*.m4
 /doc/*.1
 /doc/*.5
 /doc/*/*.1
 /doc/*/*.5
 /nls/*/*.cat
 /nls/*/generated-*.m
+/m4/*.m4

 # Exact match, if a directory then everything in directory.
 /aclocal.m4
 /autom4te.cache/
+/build-aux/
 /config.h
 /config.h.in
 /config.log
@ -26,19 +28,23 @@ Makefile.in
 /data/apps
 /data/init
 /data/menu
-/depcomp
-/install-sh
-/ltmain.sh
-/missing
-/src/FbTk/libFbTk.a
+/fbrun
+/fbsetroot
+/fluxbox
+/fluxbox-remote
+/fluxbox-update_configs
+/libFbTk.a
 /src/defaults.cc
 /src/defaults.hh
-/src/fluxbox
 /stamp-h1
-/util/fbrun/fbrun
-/util/fbsetroot
+/testDemandAttention
+/testFont
+/testFullscreen
+/testKeys
+/testRectangleUtil
+/testSignals
+/testStringUtil
+/testTexture
 /util/fluxbox-generate_menu
-/util/fluxbox-remote
-/util/fluxbox-update_configs
 /util/startfluxbox
 /version.h
--- a/1769
+++ b/1769
--- a/Makefile.am
+++ b/Makefile.am
@ -1,17 +1,82 @@
 # Makefile.am for Fluxbox - http://fluxbox.org

-# data dir after util so that utils are built for path searching
-# when generating menu
+ACLOCAL_AMFLAGS = -I m4
+AM_CPPFLAGS = \
+	-include $(top_builddir)/config.h

-SUBDIRS = doc nls src util data
-MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
-ACLOCAL_AMFLAGS = -I .
-EXTRA_DIST = acinclude.m4 $(top_srcdir)/3rd/vim/* $(top_srcdir)/3rd/vim/syntax/*
+# the defaults.hh is wrote to builddir
+src_incdir = $(top_srcdir)/src -I$(top_builddir)/src
+fbtk_incdir = $(top_srcdir)/src/FbTk
+nls_incdir = $(top_srcdir)/nls
+
+EXTRA_DIST = \
+	3rd/vim/ \
+	build-aux/config.rpath \
+	nls/fluxbox-nls.hh \
+	nls/nlsinfo
+
+CLEANFILES =
+bin_PROGRAMS =
+
+MAINTAINERCLEANFILES = \
+	aclocal.m4 \
+	config.h.in \
+	configure \
+	Makefile.in \
+	stamp-h.in
+
+DEFAULT_MENU=@DEFAULT_MENU@
+DEFAULT_STYLE=@DEFAULT_STYLE@
+DEFAULT_KEYSFILE=@DEFAULT_KEYS@
+DEFAULT_APPSFILE=@DEFAULT_APPS@
+DEFAULT_OVERLAY=@DEFAULT_OVERLAY@
+DEFAULT_INITFILE=@DEFAULT_INIT@
+DEFAULT_WINDOWMENU=@DEFAULT_WINDOWMENU@
+PROGRAM_PREFIX=@program_prefix@
+PROGRAM_SUFFIX=@program_suffix@
+
+# Do not rely on configure.ac AC_CONFIG_FILES for install paths.  The
+# paths should be expanded at make time rather than configure.
+edit_cmd = sed \
+	 -e 's|@bindir[@]|$(bindir)|g' \
+	 -e 's|@datadir[@]|$(datadir)|g' \
+	 -e 's|@exec_prefix[@]|$(exec_prefix)|g' \
+	 -e 's|@includedir[@]|$(includedir)|g' \
+	 -e 's|@localstatedir[@]|$(localstatedir)|g' \
+	 -e 's|@pkgbindir[@]|$(pkgbindir)|g' \
+	 -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \
+	 -e 's|@pkgprefix[@]|$(pkgprefix:NONE=)|g' \
+	 -e 's|@pkgsuffix[@]|$(pkgsuffix:NONE=)|g' \
+	 -e 's|@prefix[@]|$(prefix)|g' \
+	 -e 's|@sbindir[@]|$(sbindir)|g' \
+	 -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+	 -e 's|@usrbin_execdir[@]|$(usrbin_execdir)|g' \
+	 -e 's|@usrlib_execdir[@]|$(usrlib_execdir)|g' \
+	 -e 's|@usrsbin_execdir[@]|$(usrsbin_execdir)|g' \
+	 -e 's|@VERSION[@]|$(VERSION)|g'
+
+PATHFILES =
+CLEANFILES += $(PATHFILES)
+EXTRA_DIST += $(PATHFILES:=.in)
+
+$(PATHFILES): Makefile
+	@ rm -f $@ $@.tmp
+	$(AM_V_GEN) srcdir=''; \
+		test -f ./$@.in || srcdir=$(srcdir)/; \
+		$(edit_cmd) $${srcdir}$@.in >$@.tmp
+	@ mv $@.tmp $@
+
+include data/Makemodule.am
+include doc/Makemodule.am
+include nls/Makemodule.am
+include src/FbTk/Makemodule.am
+include src/Makemodule.am
+include src/tests/Makemodule.am
+include util/Makemodule.am
+include util/fbrun/Makemodule.am

 uninstall-hook:
 	rmdir $(DESTDIR)$(pkgdatadir)
-distclean-local:
-	rm -f *\~

 source-doc:
 	doxygen Doxyfile
--- a/acinclude.m4
+++ b/acinclude.m4
@ -1,231 +0,0 @@
-dnl @synopsis AC_PATH_GENERIC(LIBRARY [, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl
-dnl Runs a LIBRARY-config script and defines LIBRARY_CFLAGS and LIBRARY_LIBS
-dnl
-dnl The script must support `--cflags' and `--libs' args.
-dnl If MINIMUM-VERSION is specified, the script must also support the
-dnl `--version' arg.
-dnl If the `--with-library-[exec-]prefix' arguments to ./configure are given,
-dnl it must also support `--prefix' and `--exec-prefix'.
-dnl (In other words, it must be like gtk-config.)
-dnl
-dnl For example:
-dnl
-dnl    AC_PATH_GENERIC(Foo, 1.0.0)
-dnl
-dnl would run `foo-config --version' and check that it is at least 1.0.0
-dnl
-dnl If so, the following would then be defined:
-dnl
-dnl    FOO_CFLAGS to `foo-config --cflags`
-dnl    FOO_LIBS   to `foo-config --libs`
-dnl
-dnl At present there is no support for additional "MODULES" (see AM_PATH_GTK)
-dnl (shamelessly stolen from gtk.m4 and then hacked around a fair amount)
-dnl
-dnl @author Angus Lees <gusl@cse.unsw.edu.au>
-dnl @version $Id: ac_path_generic.m4,v 1.1.1.1 2001/07/26 00:46:28 guidod Exp $
-
-AC_DEFUN([AC_PATH_GENERIC],
-[dnl
-dnl we're going to need uppercase, lowercase and user-friendly versions of the
-dnl string `LIBRARY'
-pushdef([UP], translit([$1], [a-z], [A-Z]))dnl
-pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl
-
-dnl
-dnl Get the cflags and libraries from the LIBRARY-config script
-dnl
-AC_ARG_WITH(DOWN-prefix,[  --with-]DOWN[-prefix=PFX       Prefix where $1 is installed (optional)],
-        DOWN[]_config_prefix="$withval", DOWN[]_config_prefix="")
-AC_ARG_WITH(DOWN-exec-prefix,[  --with-]DOWN[-exec-prefix=PFX Exec prefix where $1 is installed (optional)],
-        DOWN[]_config_exec_prefix="$withval", DOWN[]_config_exec_prefix="")
-
-  if test x$DOWN[]_config_exec_prefix != x ; then
-     DOWN[]_config_args="$DOWN[]_config_args --exec-prefix=$DOWN[]_config_exec_prefix"
-     if test x${UP[]_CONFIG+set} != xset ; then
-       UP[]_CONFIG=$DOWN[]_config_exec_prefix/bin/DOWN-config
-     fi
-  fi
-  if test x$DOWN[]_config_prefix != x ; then
-     DOWN[]_config_args="$DOWN[]_config_args --prefix=$DOWN[]_config_prefix"
-     if test x${UP[]_CONFIG+set} != xset ; then
-       UP[]_CONFIG=$DOWN[]_config_prefix/bin/DOWN-config
-     fi
-  fi
-
-  AC_PATH_PROG(UP[]_CONFIG, DOWN-config, no)
-  ifelse([$2], ,
-     AC_MSG_CHECKING(for $1),
-     AC_MSG_CHECKING(for $1 - version >= $2)
-  )
-  no_[]DOWN=""
-  if test "$UP[]_CONFIG" = "no" ; then
-     no_[]DOWN=yes
-  else
-     UP[]_CFLAGS="`$UP[]_CONFIG $DOWN[]_config_args --cflags`"
-     UP[]_LIBS="`$UP[]_CONFIG $DOWN[]_config_args --libs`"
-     ifelse([$2], , ,[
-        DOWN[]_config_major_version=`$UP[]_CONFIG $DOWN[]_config_args \
-         --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-        DOWN[]_config_minor_version=`$UP[]_CONFIG $DOWN[]_config_args \
-         --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-        DOWN[]_config_micro_version=`$UP[]_CONFIG $DOWN[]_config_args \
-         --version | sed 's/[[^0-9]]*\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-        DOWN[]_wanted_major_version="regexp($2, [\<\([0-9]*\)], [\1])"
-        DOWN[]_wanted_minor_version="regexp($2, [\<\([0-9]*\)\.\([0-9]*\)], [\2])"
-        DOWN[]_wanted_micro_version="regexp($2, [\<\([0-9]*\).\([0-9]*\).\([0-9]*\)], [\3])"
-
-        # Compare wanted version to what config script returned.
-        # If I knew what library was being run, i'd probably also compile
-        # a test program at this point (which also extracted and tested
-        # the version in some library-specific way)
-        if test "$DOWN[]_config_major_version" -lt \
-                        "$DOWN[]_wanted_major_version" \
-          -o \( "$DOWN[]_config_major_version" -eq \
-                        "$DOWN[]_wanted_major_version" \
-            -a "$DOWN[]_config_minor_version" -lt \
-                        "$DOWN[]_wanted_minor_version" \) \
-          -o \( "$DOWN[]_config_major_version" -eq \
-                        "$DOWN[]_wanted_major_version" \
-            -a "$DOWN[]_config_minor_version" -eq \
-                        "$DOWN[]_wanted_minor_version" \
-            -a "$DOWN[]_config_micro_version" -lt \
-                        "$DOWN[]_wanted_micro_version" \) ; then
-          # older version found
-          no_[]DOWN=yes
-          echo -n "*** An old version of $1 "
-          echo -n "($DOWN[]_config_major_version"
-          echo -n ".$DOWN[]_config_minor_version"
-          echo    ".$DOWN[]_config_micro_version) was found."
-          echo -n "*** You need a version of $1 newer than "
-          echo -n "$DOWN[]_wanted_major_version"
-          echo -n ".$DOWN[]_wanted_minor_version"
-          echo    ".$DOWN[]_wanted_micro_version."
-          echo "***"
-          echo "*** If you have already installed a sufficiently new version, this error"
-          echo "*** probably means that the wrong copy of the DOWN-config shell script is"
-          echo "*** being found. The easiest way to fix this is to remove the old version"
-          echo "*** of $1, but you can also set the UP[]_CONFIG environment to point to the"
-          echo "*** correct copy of DOWN-config. (In this case, you will have to"
-          echo "*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf"
-          echo "*** so that the correct libraries are found at run-time)"
-        fi
-     ])
-  fi
-  if test "x$no_[]DOWN" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$3], , :, [$3])
-  else
-     AC_MSG_RESULT(no)
-     if test "$UP[]_CONFIG" = "no" ; then
-       echo "*** The DOWN-config script installed by $1 could not be found"
-       echo "*** If $1 was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the UP[]_CONFIG environment variable to the"
-       echo "*** full path to DOWN-config."
-     fi
-     UP[]_CFLAGS=""
-     UP[]_LIBS=""
-     ifelse([$4], , :, [$4])
-  fi
-  AC_SUBST(UP[]_CFLAGS)
-  AC_SUBST(UP[]_LIBS)
-
-  popdef([UP])
-  popdef([DOWN])
-])
-# xft.m4
-# Copyright (c) 2002 Henrik Kinnunen (fluxgen at linuxmail.org)
-
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the 
-# Software is furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in 
-# all copies or substantial portions of the Software. 
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
-# DEALINGS IN THE SOFTWARE.
-
-# AM_PATH_XFT1([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-AC_DEFUN([AM_PATH_XFT1],
-[
-	AC_CHECK_LIB(Xft, XftFontOpen,
-		XFT_LIBS="-lXft"
-		[$1],
-		[$2]
-	)
-])
-
-# AM_PATH_XFT2([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-AC_DEFUN([AM_PATH_XFT2],
-[
-    if test x$pkg_exec_prefix != x ; then
-        xft_args="$xft_args --exec-prefix=$pkg_exec_prefix"
-        if test x${PKG_CONFIG+set} != xset ; then
-            PKG_CONFIG=$pkg_exec_prefix/bin/pkg-config
-        fi
-    fi
-
-    if test x$xft_prefix != x ; then
-        xft_args="$xft_args --prefix=$xft_prefix"
-        if test x${PKG_CONFIG+set} != xset ; then
-            PKG_CONFIG=$xft_prefix/bin/pkg-config
-        fi
-    fi
-
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-    if test "x$PKG_CONFIG" = "xno" ; then
-        ifelse([$2], , :, [$2])
-    else 
-        XFT_CFLAGS=`$PKG_CONFIG $xftconf_args --cflags xft fontconfig`
-        XFT_LIBS=`$PKG_CONFIG $xftconf_args --libs xft fontconfig`
-        ifelse([$1], , :, [$1])
-    fi
-])
-
-# AM_PATH_XFT(default-value, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-# Test for Xft, and define XFT_CFLAGS and XFT_LIBS
-AC_DEFUN([AM_PATH_XFT],
-[
-     AC_ARG_WITH(xft-prefix,[  --with-xft-prefix=path  Prefix where Xft is installed (optional)],
-                xft_prefix="$withval", xft_prefix="")
-     AC_ARG_WITH(pkg-exec-prefix,[  --with-pkg-exec-prefix=path Exec prefix where pkg-config is installed (optional)],
-                pkg_exec_prefix="$withval", pkg_exec_prefix="")
-     AC_ARG_ENABLE(xft, [  --enable-xft            Xft (antialias) support (default=$1)],
-         if test "x$enableval" = "xyes"; then
-             TRY_XFT=yes
-         else
-             TRY_XFT=no
-         fi
-         ,
-         TRY_XFT=$1
-     )
-
-    if test "x$TRY_XFT" = "xyes"; then
-        AC_MSG_RESULT(yes)
-        AM_PATH_XFT2(
-            [$2],
-            # xft2 failed: try xft1
-            AM_PATH_XFT1(
-            [$2],
-            [$3]
-            AC_MSG_RESULT([Cant find Xft libraries! Disabling Xft]))
-        )
-    else
-        AC_MSG_RESULT(no)
-        [$3]
-    fi
-
-    CFLAGS="$CFLAGS $XFT_CFLAGS"
-    CXXFLAGS="$CXXFLAGS $XFT_CFLAGS"
-    LIBS="$XFT_LIBS $LIBS"
-])
--- a/autogen.sh
+++ b/autogen.sh
@ -14,7 +14,7 @@ dothis() {

 libtoolize --copy --force --automake
 rm -f config.cache
-dothis aclocal -I . ${ACLOCAL_FLAGS}
+dothis aclocal -I m4 ${ACLOCAL_FLAGS}
 dothis autoheader
 dothis automake -a -c
 dothis autoconf
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@ -0,0 +1,690 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+#   Copyright 1996-2012 Free Software Foundation, Inc.
+#   Taken from GNU libtool, 2001
+#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's _LT_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+  wl='-Wl,'
+else
+  case "$host_os" in
+    aix*)
+      wl='-Wl,'
+      ;;
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+        ecc*)
+          wl='-Wl,'
+          ;;
+        icc* | ifort*)
+          wl='-Wl,'
+          ;;
+        lf95*)
+          wl='-Wl,'
+          ;;
+        nagfor*)
+          wl='-Wl,-Wl,,'
+          ;;
+        pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+          wl='-Wl,'
+          ;;
+        ccc*)
+          wl='-Wl,'
+          ;;
+        xl* | bgxl* | bgf* | mpixl*)
+          wl='-Wl,'
+          ;;
+        como)
+          wl='-lopt='
+          ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ F* | *Sun*Fortran*)
+              wl=
+              ;;
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+    newsos6)
+      ;;
+    *nto* | *qnx*)
+      ;;
+    osf3* | osf4* | osf5*)
+      wl='-Wl,'
+      ;;
+    rdos*)
+      ;;
+    solaris*)
+      case $cc_basename in
+        f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+          wl='-Qoption ld '
+          ;;
+        *)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    sunos4*)
+      wl='-Qoption ld '
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      wl='-Wl,'
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
+    uts4*)
+      ;;
+  esac
+fi
+
+# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  # Set some defaults for GNU ld with shared library support. These
+  # are reset later if shared libraries are not supported. Putting them
+  # here allows them to be overridden if necessary.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  case "$host_os" in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
+      ;;
+    amigaos*)
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
+      ;;
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32* | cegcc*)
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    haiku*)
+      ;;
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
+      ;;
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+          ld_shlibs=no
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
+    sunos4*)
+      hardcode_direct=yes
+      ;;
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+  esac
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
+  fi
+else
+  case "$host_os" in
+    aix3*)
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes; then
+        # Neither direct hardcoding nor static linking is supported with a
+        # broken collect2.
+        hardcode_direct=unsupported
+      fi
+      ;;
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+        # On IA64, the linker does run time linking by default, so we don't
+        # have to do anything special.
+        aix_use_runtimelinking=no
+      else
+        aix_use_runtimelinking=no
+        # Test if we are trying to use run time linking or normal
+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+        # need to do runtime linking.
+        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+          for ld_flag in $LDFLAGS; do
+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+              aix_use_runtimelinking=yes
+              break
+            fi
+          done
+          ;;
+        esac
+      fi
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      if test "$GCC" = yes; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+          collect2name=`${CC} -print-prog-name=collect2`
+          if test -f "$collect2name" && \
+            strings "$collect2name" | grep resolve_lib_name >/dev/null
+          then
+            # We have reworked collect2
+            :
+          else
+            # We have old collect2
+            hardcode_direct=unsupported
+            hardcode_minus_L=yes
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_libdir_separator=
+          fi
+          ;;
+        esac
+      fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
+      if test "$aix_use_runtimelinking" = yes; then
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+      else
+        if test "$host_cpu" = ia64; then
+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+        else
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        fi
+      fi
+      ;;
+    amigaos*)
+      case "$host_cpu" in
+        powerpc)
+          ;;
+        m68k)
+          hardcode_libdir_flag_spec='-L$libdir'
+          hardcode_minus_L=yes
+          ;;
+      esac
+      ;;
+    bsdi[45]*)
+      ;;
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      libext=lib
+      ;;
+    darwin* | rhapsody*)
+      hardcode_direct=no
+      if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    freebsd2.2*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    freebsd2*)
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    freebsd* | dragonfly*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    hpux9*)
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      ;;
+    hpux10*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct=no
+            ;;
+          *)
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    netbsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    newsos6)
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    *nto* | *qnx*)
+      ;;
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+        hardcode_direct=yes
+        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+        else
+          case "$host_os" in
+            openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+              hardcode_libdir_flag_spec='-R$libdir'
+              ;;
+            *)
+              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+              ;;
+          esac
+        fi
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      ;;
+    osf3*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)
+      if test "$GCC" = yes; then
+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+        # Both cc and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+    solaris*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+    sunos4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    sysv4)
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
+      ;;
+    sysv4.3*)
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      ;;
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    *)
+      ld_shlibs=no
+      ;;
+  esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
+# only about the one the linker finds when passed -lNAME. This is the last
+# element of library_names_spec in libtool.m4, or possibly two of them if the
+# linker has special search rules.
+library_names_spec=      # the last element of library_names_spec in libtool.m4
+libname_spec='lib$name'
+case "$host_os" in
+  aix3*)
+    library_names_spec='$libname.a'
+    ;;
+  aix[4-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  amigaos*)
+    case "$host_cpu" in
+      powerpc*)
+        library_names_spec='$libname$shrext' ;;
+      m68k)
+        library_names_spec='$libname.a' ;;
+    esac
+    ;;
+  beos*)
+    library_names_spec='$libname$shrext'
+    ;;
+  bsdi[45]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  cygwin* | mingw* | pw32* | cegcc*)
+    shrext=.dll
+    library_names_spec='$libname.dll.a $libname.lib'
+    ;;
+  darwin* | rhapsody*)
+    shrext=.dylib
+    library_names_spec='$libname$shrext'
+    ;;
+  dgux*)
+    library_names_spec='$libname$shrext'
+    ;;
+  freebsd* | dragonfly*)
+    case "$host_os" in
+      freebsd[123]*)
+        library_names_spec='$libname$shrext$versuffix' ;;
+      *)
+        library_names_spec='$libname$shrext' ;;
+    esac
+    ;;
+  gnu*)
+    library_names_spec='$libname$shrext'
+    ;;
+  haiku*)
+    library_names_spec='$libname$shrext'
+    ;;
+  hpux9* | hpux10* | hpux11*)
+    case $host_cpu in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
+    library_names_spec='$libname$shrext'
+    ;;
+  interix[3-9]*)
+    library_names_spec='$libname$shrext'
+    ;;
+  irix5* | irix6* | nonstopux*)
+    library_names_spec='$libname$shrext'
+    case "$host_os" in
+      irix5* | nonstopux*)
+        libsuff= shlibsuff=
+        ;;
+      *)
+        case $LD in
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+          *) libsuff= shlibsuff= ;;
+        esac
+        ;;
+    esac
+    ;;
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  knetbsd*-gnu)
+    library_names_spec='$libname$shrext'
+    ;;
+  netbsd*)
+    library_names_spec='$libname$shrext'
+    ;;
+  newsos6)
+    library_names_spec='$libname$shrext'
+    ;;
+  *nto* | *qnx*)
+    library_names_spec='$libname$shrext'
+    ;;
+  openbsd*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  os2*)
+    libname_spec='$name'
+    shrext=.dll
+    library_names_spec='$libname.a'
+    ;;
+  osf3* | osf4* | osf5*)
+    library_names_spec='$libname$shrext'
+    ;;
+  rdos*)
+    ;;
+  solaris*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sunos4*)
+    library_names_spec='$libname$shrext$versuffix'
+    ;;
+  sysv4 | sysv4.3*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv4*MP*)
+    library_names_spec='$libname$shrext'
+    ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    library_names_spec='$libname$shrext'
+    ;;
+  tpf*)
+    library_names_spec='$libname$shrext'
+    ;;
+  uts4*)
+    library_names_spec='$libname$shrext'
+    ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Format of library name prefix.
+libname_spec="$escaped_libname_spec"
+
+# Library names that the linker finds when passed -lNAME.
+library_names_spec="$escaped_library_names_spec"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF
--- a/configure.ac
+++ b/configure.ac
--- a/data/Makemodule.am
+++ b/data/Makemodule.am
@ -1,22 +1,33 @@
 # data/Makefile.am for Fluxbox - an X11 Window manager

-PROGRAM_PREFIX=@program_prefix@
-PROGRAM_SUFFIX=@program_suffix@
+EXTRA_DIST += \
+	data/keys \
+	data/overlay \
+	data/windowmenu

-DEFAULT_MENU = @DEFAULT_MENU@
-DEFAULT_STYLE = @DEFAULT_STYLE@
-DEFAULT_KEYS = @DEFAULT_KEYS@
-DEFAULT_APPS = @DEFAULT_APPS@
-DEFAULT_OVERLAY = @DEFAULT_OVERLAY@
-DEFAULT_INIT = @DEFAULT_INIT@
-DEFAULT_WINDOWMENU = @DEFAULT_WINDOWMENU@
+PATHFILES += \
+	data/apps \
+	data/init
+
+include data/styles/carp/Makemodule.am
+include data/styles/bora_blue/Makemodule.am
+include data/styles/green_tea/Makemodule.am
+include data/styles/bora_green/Makemodule.am
+include data/styles/Makemodule.am
+include data/styles/zimek_bisque/Makemodule.am
+include data/styles/bloe/pixmaps/Makemodule.am
+include data/styles/bloe/Makemodule.am
+include data/styles/Emerge/pixmaps/Makemodule.am
+include data/styles/Emerge/Makemodule.am
+include data/styles/ostrich/Makemodule.am
+include data/styles/zimek_green/Makemodule.am
+include data/styles/zimek_darkblue/Makemodule.am
+include data/styles/BlueFlux/pixmaps/Makemodule.am
+include data/styles/BlueFlux/Makemodule.am
+include data/styles/bora_black/Makemodule.am
+include data/styles/arch/pixmaps/Makemodule.am
+include data/styles/arch/Makemodule.am

-SUBDIRS= 		styles
-CLEANFILES= 		menu menu.in menu.pre menu.bak init apps
-MAINTAINERCLEANFILES= 	Makefile.in
-pkgdata_DATA= 		keys menu init apps overlay windowmenu
-EXTRA_DIST= 		keys init.in apps.in overlay windowmenu
-all-local: 		menu init apps
 install-pkgdataDATA:
 	@echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)"
 	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_MENU))
@ -37,26 +48,10 @@ install-pkgdataDATA:
 	$(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_WINDOWMENU))
 	$(INSTALL_DATA) $(srcdir)/windowmenu $(DESTDIR)$(DEFAULT_WINDOWMENU)

-distclean-local:
-		rm -f *\~
-init: 			init.in
-	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
-			-e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-			-e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
-			-e "s,@default_style@,$(DEFAULT_STYLE),g" $(srcdir)/init.in > init
-
-apps: 			apps.in
-	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
-			-e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
-			-e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" $(srcdir)/apps.in > apps
-
-menu: 			../util/fluxbox-generate_menu
+menu:
 	env	MENUFILENAME=menu \
 		PREFIX="${prefix}" \
 		MENUTITLE="Fluxbox-${VERSION}" \
 		INSTALL=Yes \
 		PATH="${PATH}:../util:../util/fbrun" \
-		../util/fluxbox-generate_menu
-
-../util/fluxbox-generate_menu:
-	cd ../util && ${MAKE} fluxbox-generate_menu
+		util/fluxbox-generate_menu
--- a/data/styles/BlueFlux/Makefile.am
+++ b/data/styles/BlueFlux/Makefile.am
@ -1,6 +0,0 @@
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/BlueFlux
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
--- a/data/styles/BlueFlux/Makemodule.am
+++ b/data/styles/BlueFlux/Makemodule.am
@ -0,0 +1,3 @@
+blueflux_styledir = $(pkgdatadir)/styles/BlueFlux
+
+dist_blueflux_style_DATA = data/styles/BlueFlux/theme.cfg
--- a/data/styles/BlueFlux/pixmaps/.cvsignore
+++ b/data/styles/BlueFlux/pixmaps/.cvsignore
@ -1,2 +0,0 @@
-Makefile
-Makefile.in
--- a/data/styles/BlueFlux/pixmaps/Makefile.am
+++ b/data/styles/BlueFlux/pixmaps/Makefile.am
@ -1,11 +0,0 @@
-styledir = $(pkgdatadir)/styles/BlueFlux/pixmaps
-
-style_DATA = button_close_active.xpm button_close_pressed.xpm \
-	button_close_unfocus.xpm button_max_active.xpm button_max_pressed.xpm \
-	button_max_unfocus.xpm button_min_active.xpm button_min_pressed.xpm \
-	button_min_unfocus.xpm button_stick_active.xpm button_stick_pressed.xpm \
-	button_stick_unfocus.xpm button_stuck.xpm button_stuck_unfocus.xpm \
-	button_toolbar.xpm button_toolbar_pressed.xpm menu_frame.xpm title_bar.xpm \
-	title_bar_unfocus.xpm toolbar.xpm toolbar_label.xpm
-
-include ../../Makefile.include
--- a/data/styles/BlueFlux/pixmaps/Makemodule.am
+++ b/data/styles/BlueFlux/pixmaps/Makemodule.am
@ -0,0 +1,24 @@
+blueflux_pixmaps_styledir = $(pkgdatadir)/styles/BlueFlux/pixmaps
+
+dist_blueflux_pixmaps_style_DATA = \
+	data/styles/BlueFlux/pixmaps/button_close_active.xpm \
+	data/styles/BlueFlux/pixmaps/button_close_pressed.xpm \
+	data/styles/BlueFlux/pixmaps/button_close_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/button_max_active.xpm \
+	data/styles/BlueFlux/pixmaps/button_max_pressed.xpm \
+	data/styles/BlueFlux/pixmaps/button_max_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/button_min_active.xpm \
+	data/styles/BlueFlux/pixmaps/button_min_pressed.xpm \
+	data/styles/BlueFlux/pixmaps/button_min_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/button_stick_active.xpm \
+	data/styles/BlueFlux/pixmaps/button_stick_pressed.xpm \
+	data/styles/BlueFlux/pixmaps/button_stick_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/button_stuck.xpm \
+	data/styles/BlueFlux/pixmaps/button_stuck_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/button_toolbar.xpm \
+	data/styles/BlueFlux/pixmaps/button_toolbar_pressed.xpm \
+	data/styles/BlueFlux/pixmaps/menu_frame.xpm \
+	data/styles/BlueFlux/pixmaps/title_bar.xpm \
+	data/styles/BlueFlux/pixmaps/title_bar_unfocus.xpm \
+	data/styles/BlueFlux/pixmaps/toolbar.xpm \
+	data/styles/BlueFlux/pixmaps/toolbar_label.xpm
--- a/data/styles/Emerge/Makefile.am
+++ b/data/styles/Emerge/Makefile.am
@ -1,6 +0,0 @@
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/Emerge
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
--- a/data/styles/Emerge/Makemodule.am
+++ b/data/styles/Emerge/Makemodule.am
@ -0,0 +1,3 @@
+emerge_styledir = $(pkgdatadir)/styles/Emerge
+
+dist_emerge_style_DATA = data/styles/Emerge/theme.cfg
--- a/data/styles/Emerge/pixmaps/.cvsignore
+++ b/data/styles/Emerge/pixmaps/.cvsignore
@ -1,2 +0,0 @@
-Makefile
-Makefile.in
--- a/data/styles/Emerge/pixmaps/Makefile.am
+++ b/data/styles/Emerge/pixmaps/Makefile.am
@ -1,8 +0,0 @@
-styledir = $(pkgdatadir)/styles/Emerge/pixmaps
-
-style_DATA = bullet.xpm close.xpm icon.xpm max.xpm stick-unfocus.xpm \
-	stuck-unfocus.xpm close-pressed.xpm icon-pressed.xpm max-pressed.xpm \
-	selected.xpm stick.xpm stuck.xpm close-unfocus.xpm icon-unfocus.xpm \
-    max-unfocus.xpm stick-pressed.xpm stuck-pressed.xpm unselected.xpm
-
-include ../../Makefile.include
--- a/data/styles/Emerge/pixmaps/Makemodule.am
+++ b/data/styles/Emerge/pixmaps/Makemodule.am
@ -0,0 +1,21 @@
+emerge_pixmaps_styledir = $(pkgdatadir)/styles/Emerge/pixmaps
+
+dist_emerge_pixmaps_style_DATA = \
+	data/styles/Emerge/pixmaps/bullet.xpm \
+	data/styles/Emerge/pixmaps/close-pressed.xpm \
+	data/styles/Emerge/pixmaps/close-unfocus.xpm \
+	data/styles/Emerge/pixmaps/close.xpm \
+	data/styles/Emerge/pixmaps/icon-pressed.xpm \
+	data/styles/Emerge/pixmaps/icon-unfocus.xpm \
+	data/styles/Emerge/pixmaps/icon.xpm \
+	data/styles/Emerge/pixmaps/max-pressed.xpm \
+	data/styles/Emerge/pixmaps/max-unfocus.xpm \
+	data/styles/Emerge/pixmaps/max.xpm \
+	data/styles/Emerge/pixmaps/selected.xpm \
+	data/styles/Emerge/pixmaps/stick-pressed.xpm \
+	data/styles/Emerge/pixmaps/stick-unfocus.xpm \
+	data/styles/Emerge/pixmaps/stick.xpm \
+	data/styles/Emerge/pixmaps/stuck-pressed.xpm \
+	data/styles/Emerge/pixmaps/stuck-unfocus.xpm \
+	data/styles/Emerge/pixmaps/stuck.xpm \
+	data/styles/Emerge/pixmaps/unselected.xpm
--- a/data/styles/Makefile.am
+++ b/data/styles/Makefile.am
@ -1,11 +0,0 @@
-SUBDIRS=Emerge BlueFlux bora_black bora_blue bora_green \
-	zimek_bisque zimek_darkblue zimek_green \
-	arch carp ostrich green_tea bloe
-
-styledir = $(pkgdatadir)/styles
-
-style_DATA = Makro MerleyKay Artwiz Flux \
-	Nyz Operation Outcomes Results Shade LemonSpace \
-	Twice qnx-photon BlueNight Meta
-
-include Makefile.include
--- a/data/styles/Makefile.include
+++ b/data/styles/Makefile.include
@ -1,10 +0,0 @@
-## included by all Makefile.am files under the data/styles directory
-
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST=$(style_DATA)
-
-uninstall-hook:
-	rmdir $(DESTDIR)$(styledir)
-distclean-local:
-	rm -f *\~
--- a/data/styles/Makemodule.am
+++ b/data/styles/Makemodule.am
@ -0,0 +1,19 @@
+styledir = $(pkgdatadir)/styles
+
+style_DATA = \
+	data/styles/Artwiz \
+	data/styles/BlueNight \
+	data/styles/Flux \
+	data/styles/LemonSpace \
+	data/styles/Makro \
+	data/styles/MerleyKay \
+	data/styles/Meta \
+	data/styles/Nyz \
+	data/styles/Operation \
+	data/styles/Outcomes \
+	data/styles/Results \
+	data/styles/Shade \
+	data/styles/Twice \
+	data/styles/qnx-photon
+
+EXTRA_DIST += $(style_DATA)
--- a/data/styles/arch/Makefile.am
+++ b/data/styles/arch/Makefile.am
@ -1,6 +0,0 @@
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/arch
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
--- a/data/styles/arch/Makemodule.am
+++ b/data/styles/arch/Makemodule.am
@ -0,0 +1,3 @@
+arch_styledir = $(pkgdatadir)/styles/arch
+
+dist_arch_style_DATA = data/styles/arch/theme.cfg
--- a/data/styles/arch/pixmaps/Makefile.am
+++ b/data/styles/arch/pixmaps/Makefile.am
@ -1,12 +0,0 @@
-styledir = $(pkgdatadir)/styles/arch/pixmaps
-
-style_DATA = closepr.xpm gripfcs.xpm maxufcs.xpm menuiconufcs.xpm \
-	 minufcs.xpm shadepr.xpm stickpr.xpm stuckufcs.xpm unselected.xpm \
-	 unshadeufcs.xpm bullet.xpm closeufcs.xpm maxfcs.xpm \
-	 menuiconfcs.xpm minfcs.xpm selected.xpm shadeufcs.xpm \
-	 stickufcs.xpm tbarfcs.xpm unshadefcs.xpm closefcs.xpm \
-	frame.xpm maxpr.xpm menuiconpr.xpm minpr.xpm shadefcs.xpm \
-	 stickfcs.xpm stuckfcs.xpm tbarufcs.xpm unshadepr.xpm
-
-
-include ../../Makefile.include
--- a/data/styles/arch/pixmaps/Makemodule.am
+++ b/data/styles/arch/pixmaps/Makemodule.am
@ -0,0 +1,33 @@
+arch_pixmaps_styledir = $(pkgdatadir)/styles/arch/pixmaps
+
+dist_arch_pixmaps_style_DATA = \
+	data/styles/arch/pixmaps/bullet.xpm \
+	data/styles/arch/pixmaps/closefcs.xpm \
+	data/styles/arch/pixmaps/closepr.xpm \
+	data/styles/arch/pixmaps/closeufcs.xpm \
+	data/styles/arch/pixmaps/frame.xpm \
+	data/styles/arch/pixmaps/gripfcs.xpm \
+	data/styles/arch/pixmaps/maxfcs.xpm \
+	data/styles/arch/pixmaps/maxpr.xpm \
+	data/styles/arch/pixmaps/maxufcs.xpm \
+	data/styles/arch/pixmaps/menuiconfcs.xpm \
+	data/styles/arch/pixmaps/menuiconpr.xpm \
+	data/styles/arch/pixmaps/menuiconufcs.xpm \
+	data/styles/arch/pixmaps/minfcs.xpm \
+	data/styles/arch/pixmaps/minpr.xpm \
+	data/styles/arch/pixmaps/minufcs.xpm \
+	data/styles/arch/pixmaps/selected.xpm \
+	data/styles/arch/pixmaps/shadefcs.xpm \
+	data/styles/arch/pixmaps/shadepr.xpm \
+	data/styles/arch/pixmaps/shadeufcs.xpm \
+	data/styles/arch/pixmaps/stickfcs.xpm \
+	data/styles/arch/pixmaps/stickpr.xpm \
+	data/styles/arch/pixmaps/stickufcs.xpm \
+	data/styles/arch/pixmaps/stuckfcs.xpm \
+	data/styles/arch/pixmaps/stuckufcs.xpm \
+	data/styles/arch/pixmaps/tbarfcs.xpm \
+	data/styles/arch/pixmaps/tbarufcs.xpm \
+	data/styles/arch/pixmaps/unselected.xpm \
+	data/styles/arch/pixmaps/unshadefcs.xpm \
+	data/styles/arch/pixmaps/unshadepr.xpm \
+	data/styles/arch/pixmaps/unshadeufcs.xpm
--- a/data/styles/bloe/Makefile.am
+++ b/data/styles/bloe/Makefile.am
@ -1,6 +0,0 @@
-SUBDIRS=pixmaps
-styledir = $(pkgdatadir)/styles/bloe
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
--- a/data/styles/bloe/Makemodule.am
+++ b/data/styles/bloe/Makemodule.am
@ -0,0 +1,3 @@
+bloe_styledir = $(pkgdatadir)/styles/bloe
+
+dist_bloe_style_DATA = data/styles/bloe/theme.cfg
--- a/data/styles/bloe/pixmaps/Makefile.am
+++ b/data/styles/bloe/pixmaps/Makefile.am
@ -1,13 +0,0 @@
-styledir = $(pkgdatadir)/styles/bloe/pixmaps
-
-style_DATA = bullet.xpm closepr.xpm frame.xpm maxfcs.xpm \
-	maxufcs.xpm menuiconpr.xpm minfcs.xpm minufcs.xpm \
-	shadefcs.xpm shadeufcs.xpm stickpr.xpm stuckfcs.xpm \
-	tbarfcs.xpm unselected.xpm unshadepr.xpm \
-	windowlabelfcs.xpm closefcs.xpm closeufcs.xpm \
-	maxpr.xpm menuiconfcs.xpm menuiconufcs.xpm \
-	minpr.xpm selected.xpm shadepr.xpm stickfcs.xpm \
-	stickufcs.xpm stuckufcs.xpm tbarufcs.xpm \
-	unshadefcs.xpm unshadeufcs.xpm windowlabelufcs.xpm
-
-include ../../Makefile.include
--- a/data/styles/bloe/pixmaps/Makemodule.am
+++ b/data/styles/bloe/pixmaps/Makemodule.am
@ -0,0 +1,34 @@
+pixmaps_styledir = $(pkgdatadir)/styles/bloe/pixmaps
+
+dist_pixmaps_style_DATA = \
+	data/styles/bloe/pixmaps/bullet.xpm \
+	data/styles/bloe/pixmaps/closefcs.xpm \
+	data/styles/bloe/pixmaps/closepr.xpm \
+	data/styles/bloe/pixmaps/closeufcs.xpm \
+	data/styles/bloe/pixmaps/frame.xpm \
+	data/styles/bloe/pixmaps/maxfcs.xpm \
+	data/styles/bloe/pixmaps/maxpr.xpm \
+	data/styles/bloe/pixmaps/maxufcs.xpm \
+	data/styles/bloe/pixmaps/menuiconfcs.xpm \
+	data/styles/bloe/pixmaps/menuiconpr.xpm \
+	data/styles/bloe/pixmaps/menuiconufcs.xpm \
+	data/styles/bloe/pixmaps/minfcs.xpm \
+	data/styles/bloe/pixmaps/minpr.xpm \
+	data/styles/bloe/pixmaps/minufcs.xpm \
+	data/styles/bloe/pixmaps/selected.xpm \
+	data/styles/bloe/pixmaps/shadefcs.xpm \
+	data/styles/bloe/pixmaps/shadepr.xpm \
+	data/styles/bloe/pixmaps/shadeufcs.xpm \
+	data/styles/bloe/pixmaps/stickfcs.xpm \
+	data/styles/bloe/pixmaps/stickpr.xpm \
+	data/styles/bloe/pixmaps/stickufcs.xpm \
+	data/styles/bloe/pixmaps/stuckfcs.xpm \
+	data/styles/bloe/pixmaps/stuckufcs.xpm \
+	data/styles/bloe/pixmaps/tbarfcs.xpm \
+	data/styles/bloe/pixmaps/tbarufcs.xpm \
+	data/styles/bloe/pixmaps/unselected.xpm \
+	data/styles/bloe/pixmaps/unshadefcs.xpm \
+	data/styles/bloe/pixmaps/unshadepr.xpm \
+	data/styles/bloe/pixmaps/unshadeufcs.xpm \
+	data/styles/bloe/pixmaps/windowlabelfcs.xpm \
+	data/styles/bloe/pixmaps/windowlabelufcs.xpm
--- a/data/styles/bora_black/Makefile.am
+++ b/data/styles/bora_black/Makefile.am
@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/bora_black
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
--- a/data/styles/bora_black/Makemodule.am
+++ b/data/styles/bora_black/Makemodule.am
@ -0,0 +1,3 @@
+bora_black_styledir = $(pkgdatadir)/styles/bora_black
+
+dist_bora_black_style_DATA = data/styles/bora_black/theme.cfg
--- a/data/styles/bora_blue/Makefile.am
+++ b/data/styles/bora_blue/Makefile.am
@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/bora_blue
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
--- a/data/styles/bora_blue/Makemodule.am
+++ b/data/styles/bora_blue/Makemodule.am
@ -0,0 +1,3 @@
+bora_blue_styledir = $(pkgdatadir)/styles/bora_blue
+
+dist_bora_blue_style_DATA = data/styles/bora_blue/theme.cfg
--- a/data/styles/bora_green/Makefile.am
+++ b/data/styles/bora_green/Makefile.am
@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/bora_green
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
--- a/data/styles/bora_green/Makemodule.am
+++ b/data/styles/bora_green/Makemodule.am
@ -0,0 +1,3 @@
+bora_green_styledir = $(pkgdatadir)/styles/bora_green
+
+dist_bora_green_style_DATA = data/styles/bora_green/theme.cfg
--- a/data/styles/carp/Makefile.am
+++ b/data/styles/carp/Makefile.am
@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/carp
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
--- a/data/styles/carp/Makemodule.am
+++ b/data/styles/carp/Makemodule.am
@ -0,0 +1,3 @@
+carp_styledir = $(pkgdatadir)/styles/carp
+
+dist_carp_style_DATA = data/styles/carp/theme.cfg
--- a/data/styles/green_tea/Makefile.am
+++ b/data/styles/green_tea/Makefile.am
@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/green_tea
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
--- a/data/styles/green_tea/Makemodule.am
+++ b/data/styles/green_tea/Makemodule.am
@ -0,0 +1,3 @@
+green_tea_styledir = $(pkgdatadir)/styles/green_tea
+
+dist_green_tea_style_DATA = data/styles/green_tea/theme.cfg
--- a/data/styles/ostrich/Makefile.am
+++ b/data/styles/ostrich/Makefile.am
@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/ostrich
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
--- a/data/styles/ostrich/Makemodule.am
+++ b/data/styles/ostrich/Makemodule.am
@ -0,0 +1,3 @@
+ostrich_styledir = $(pkgdatadir)/styles/ostrich
+
+dist_ostrich_style_DATA = data/styles/ostrich/theme.cfg
--- a/data/styles/zimek_bisque/Makefile.am
+++ b/data/styles/zimek_bisque/Makefile.am
@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/zimek_bisque
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
--- a/data/styles/zimek_bisque/Makemodule.am
+++ b/data/styles/zimek_bisque/Makemodule.am
@ -0,0 +1,3 @@
+zimek_bisque_styledir = $(pkgdatadir)/styles/zimek_bisque
+
+dist_zimek_bisque_style_DATA = data/styles/zimek_bisque/theme.cfg
--- a/data/styles/zimek_darkblue/Makefile.am
+++ b/data/styles/zimek_darkblue/Makefile.am
@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/zimek_darkblue
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
--- a/data/styles/zimek_darkblue/Makemodule.am
+++ b/data/styles/zimek_darkblue/Makemodule.am
@ -0,0 +1,3 @@
+zimek_darkblue_styledir = $(pkgdatadir)/styles/zimek_darkblue
+
+dist_zimek_darkblue_style_DATA = data/styles/zimek_darkblue/theme.cfg
--- a/data/styles/zimek_green/Makefile.am
+++ b/data/styles/zimek_green/Makefile.am
@ -1,5 +0,0 @@
-styledir = $(pkgdatadir)/styles/zimek_green
-
-style_DATA = theme.cfg
-
-include ../Makefile.include
--- a/data/styles/zimek_green/Makemodule.am
+++ b/data/styles/zimek_green/Makemodule.am
@ -0,0 +1,3 @@
+zimek_green_styledir = $(pkgdatadir)/styles/zimek_green
+
+dist_zimek_green_style_DATA = data/styles/zimek_green/theme.cfg
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@ -1,17 +0,0 @@
-# doc/Makefile.am for Fluxbox 0.9  - an X11 Window manager
-# Makefile.am for fluxbox/doc
-
-CLEANFILES = fluxbox.1 fbrun.1 fbsetbg.1 fbsetroot.1 startfluxbox.1 fluxbox-apps.5 \
-	fluxbox-keys.5 fluxbox-menu.5 fluxbox-remote.1 fluxbox-style.5
-MAINTAINERCLEANFILES = Makefile.in
-man_MANS = fluxbox.1 fbrun.1 fbsetbg.1 fbsetroot.1 fluxbox-apps.5 \
-	fluxbox-keys.5 fluxbox-menu.5 fluxbox-remote.1 fluxbox-style.5 \
-	startfluxbox.1
-EXTRA_DIST=startfluxbox.1.in CODESTYLE \
-	fluxbox.1.in fbrun.1.in fbsetbg.1.in fbsetroot.1.in fluxbox-apps.5.in \
-	fluxbox-keys.5.in fluxbox-menu.5.in fluxbox-remote.1.in fluxbox-style.5.in
-distclean-local:
-	rm -f *\~
-
-%: %.in
-	@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," $^ > $@
--- a/doc/Makemodule.am
+++ b/doc/Makemodule.am
@ -0,0 +1,39 @@
+CLEANFILES += \
+	doc/fbrun.1 \
+	doc/fbsetbg.1 \
+	doc/fbsetroot.1 \
+	doc/fluxbox-apps.5 \
+	doc/fluxbox-keys.5 \
+	doc/fluxbox-menu.5 \
+	doc/fluxbox-remote.1 \
+	doc/fluxbox-style.5 \
+	doc/fluxbox.1 \
+	doc/startfluxbox.1
+
+dist_man_MANS = \
+	doc/fbrun.1 \
+	doc/fbsetbg.1 \
+	doc/fbsetroot.1 \
+	doc/fluxbox-apps.5 \
+	doc/fluxbox-keys.5 \
+	doc/fluxbox-menu.5 \
+	doc/fluxbox-remote.1 \
+	doc/fluxbox-style.5 \
+	doc/fluxbox.1 \
+	doc/startfluxbox.1
+
+EXTRA_DIST += \
+	doc/CODESTYLE \
+	doc/fbrun.1.in \
+	doc/fbsetbg.1.in \
+	doc/fbsetroot.1.in \
+	doc/fluxbox-apps.5.in \
+	doc/fluxbox-keys.5.in \
+	doc/fluxbox-menu.5.in \
+	doc/fluxbox-remote.1.in \
+	doc/fluxbox-style.5.in \
+	doc/fluxbox.1.in \
+	doc/startfluxbox.1.in
+
+%: %.in
+	@regex_cmd@ -e "s,@pkgdatadir[@],$(pkgdatadir)," $^ > $@
--- a/doc/asciidoc/Makefile
+++ b/doc/asciidoc/Makefile
@ -2,10 +2,24 @@
 # create manpages from the asciidoc files
 #

-SRC1 = fluxbox.txt fluxbox-remote.txt fbrun.txt fbsetbg.txt fbsetroot.txt startfluxbox.txt
-SRC5 = fluxbox-keys.txt fluxbox-apps.txt fluxbox-style.txt fluxbox-menu.txt
+SRC1 = \
+	fbrun.txt \
+	fbsetbg.txt \
+	fbsetroot.txt \
+	fluxbox-remote.txt \
+	fluxbox.txt \
+	startfluxbox.txt
+
+SRC5 = \
+	fluxbox-apps.txt \
+	fluxbox-keys.txt \
+	fluxbox-menu.txt \
+	fluxbox-style.txt
+
+MAN = \
+	$(SRC1:.txt=.1) \
+	$(SRC5:.txt=.5)

-MAN = $(SRC1:.txt=.1) $(SRC5:.txt=.5)
 MANdotIN = $(addsuffix .in,$(MAN))
 DISTFILES = $(addprefix ../,$(MANdotIN))

--- a/nls/Makefile.am
+++ b/nls/Makefile.am
@ -1,24 +0,0 @@
-# nls/Makefile.am for fluxbox - http://fluxbox.org
-
-LOCALE_PATH = @LOCALE_PATH@
-NLSTEST = @NLS@
-SUBDIRS = C cs_CZ da_DK es_AR es_ES et_EE fr_FR pt_BR ru_RU \
-		  sv_SE tr_TR it_IT pt_PT bg_BG ja_JP ko_KR \
-		  lv_LV de_DE nl_NL no_NO sl_SI pl_PL vi_VN be_BY \
-		  uk_UA el_GR nb_NO zh_CN fi_FI en_US en_GB de_CH \
-		  de_AT fr_CH sk_SK zh_TW mk_MK he_IL
-
-MAINTAINERCLEANFILES = Makefile.in fluxbox-nls.hh
-EXTRA_DIST=fluxbox-nls.hh nlsinfo
-BUILT_SOURCES=fluxbox-nls.hh
-
-uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rmdir $(DESTDIR)$(LOCALE_PATH); \
-	fi
-distclean-local:
-	rm -f *\~
-
-fluxbox-nls.hh:
-	chmod +x $(srcdir)/nlsinfo
-	$(srcdir)/nlsinfo -H -N FBNLS $(top_srcdir)/src $(top_srcdir)/util > fluxbox-nls.hh
--- a/nls/Makemodule.am
+++ b/nls/Makemodule.am
@ -0,0 +1,53 @@
+# nls/Makefile.am for fluxbox - http://fluxbox.org
+
+LOCALE_PATH = @LOCALE_PATH@
+NLSTEST = @NLS@
+
+SUBDIRS = \
+	nls/C \
+	nls/be_BY \
+	nls/bg_BG \
+	nls/cs_CZ \
+	nls/da_DK \
+	nls/de_AT \
+	nls/de_CH \
+	nls/de_DE \
+	nls/el_GR \
+	nls/en_GB \
+	nls/en_US \
+	nls/es_AR \
+	nls/es_ES \
+	nls/et_EE \
+	nls/fi_FI \
+	nls/fr_CH \
+	nls/fr_FR \
+	nls/he_IL \
+	nls/it_IT \
+	nls/ja_JP \
+	nls/ko_KR \
+	nls/lv_LV \
+	nls/mk_MK \
+	nls/nb_NO \
+	nls/nl_NL \
+	nls/no_NO \
+	nls/pl_PL \
+	nls/pt_BR \
+	nls/pt_PT \
+	nls/ru_RU \
+	nls/sk_SK \
+	nls/sl_SI \
+	nls/sv_SE \
+	nls/tr_TR \
+	nls/uk_UA \
+	nls/vi_VN \
+	nls/zh_CN \
+	nls/zh_TW
+
+uninstall-local:
+	@if test x$(NLSTEST) = "x-DNLS"; then \
+		rmdir $(DESTDIR)$(LOCALE_PATH); \
+	fi
+
+fluxbox-nls.hh:
+	chmod +x $(srcdir)/nlsinfo
+	$(srcdir)/nlsinfo -H -N FBNLS $(top_srcdir)/src $(top_srcdir)/util > fluxbox-nls.hh
--- a/src/ClientPattern.cc
+++ b/src/ClientPattern.cc
@ -34,11 +34,6 @@
 #include "FbTk/stringstream.hh"
 #include "FbTk/STLUtil.hh"

-// use GNU extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include <fstream>
 #include <string>
 #include <memory>
--- a/src/ClockTool.cc
+++ b/src/ClockTool.cc
@ -37,10 +37,6 @@
 #include "FbTk/I18n.hh"
 #include "FbTk/FbTime.hh"

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CTIME
  #include <ctime>
 #else
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@ -39,10 +39,6 @@
 #include "FbTk/Util.hh"
 #include "FbTk/RelCalcHelper.hh"

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CSTDLIB
 #include <cstdlib>
 #else
--- a/src/Debug.hh
+++ b/src/Debug.hh
@ -1,10 +1,6 @@
 #ifndef DEBUG_HH
 #define DEBUG_HH

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef DEBUG
 #include <iostream>
 #define fbdbg std::cerr<<__FILE__<<"("<<__LINE__<< "): "
--- a/src/FbCommands.cc
+++ b/src/FbCommands.cc
@ -54,11 +54,6 @@
  #include <string.h>
 #endif

-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #if defined(__EMX__) && defined(HAVE_PROCESS_H)
 #include <process.h> // for P_NOWAIT
 #endif // __EMX__
--- a/src/FbTk/FbString.cc
+++ b/src/FbTk/FbString.cc
@ -55,7 +55,7 @@ typedef int iconv_t;
 #endif // HAVE_ICONV

 #ifdef HAVE_FRIBIDI
-  #include <fribidi/fribidi.h>
+  #include <fribidi.h>
 #endif

 #ifdef DEBUG
--- a/src/FbTk/FbString.hh
+++ b/src/FbTk/FbString.hh
@ -25,7 +25,6 @@

 #include <string>

-#include "config.h"
 #ifdef HAVE_ICONV
 #include <iconv.h>
 #endif // HAVE_ICONV
--- a/src/FbTk/FbTime.hh
+++ b/src/FbTk/FbTime.hh
@ -22,12 +22,6 @@
 #ifndef FBTK_FBTIME_HH
 #define FBTK_FBTIME_HH

-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
-
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
 #endif // HAVE_INTTYPES_H
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@ -28,10 +28,6 @@
 #include "App.hh"
 #include "Transparent.hh"

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>

--- a/src/FbTk/FileUtil.hh
+++ b/src/FbTk/FileUtil.hh
@ -22,9 +22,6 @@
 #ifndef FBTK_FILEUTIL_HH
 #define FBTK_FILEUTIL_HH

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
 #ifdef HAVE_CTIME
  #include <ctime>
 #else
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@ -25,10 +25,6 @@
 #include "FontImp.hh"
 #include "App.hh"

-#ifdef    HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 // for antialias
 #ifdef USE_XFT
 #include "XftFontImp.hh"
@ -43,10 +39,6 @@
 #include "XFontImp.hh"

 #include "GContext.hh"
-//use gnu extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif //_GNU_SOURCE

 #ifndef __USE_GNU
 #define __USE_GNU
--- a/src/FbTk/Font.hh
+++ b/src/FbTk/Font.hh
@ -24,10 +24,6 @@

 #include <X11/Xlib.h>

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include "FbString.hh"
 #include "Color.hh"
 #include "Orientation.hh"
--- a/src/FbTk/I18n.cc
+++ b/src/FbTk/I18n.cc
@ -30,11 +30,6 @@
 * http://www.kulichki.com/moshkow/CYRILLIC/locale-tutorial-0_8.txt
 */

-//use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include "I18n.hh"
 #include "FileUtil.hh"

--- a/src/FbTk/I18n.hh
+++ b/src/FbTk/I18n.hh
@ -30,11 +30,6 @@

 #include "FbString.hh"

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
-
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif // HAVE_LOCALE_H
--- a/src/FbTk/Image.cc
+++ b/src/FbTk/Image.cc
@ -23,10 +23,6 @@
 #include "StringUtil.hh"
 #include "FileUtil.hh"

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_XPM
 #include "ImageXPM.hh"
 #endif // HAVE_XPM
--- a/src/FbTk/ImageControl.cc
+++ b/src/FbTk/ImageControl.cc
@ -30,16 +30,6 @@
 #include "SimpleCommand.hh"
 #include "I18n.hh"

-//use GNU extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif // HAVE_SYS_TYPES_H
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@ -1,74 +0,0 @@
-noinst_LIBRARIES = libFbTk.a
-
-AM_CPPFLAGS=@CPPFLAGS@
-
-if XFT
-xft_SOURCE= XftFontImp.hh XftFontImp.cc
-endif
-if MULTIBYTE
-xmb_SOURCE= XmbFontImp.hh XmbFontImp.cc
-endif
-if XPM
-xpm_SOURCE= ImageXPM.hh ImageXPM.cc
-endif
-if IMLIB2
-imlib2_SOURCE= ImageImlib2.hh ImageImlib2.cc
-endif
-
-libFbTk_a_SOURCES = App.hh App.cc \
-	Color.cc Color.hh Command.hh \
-	ColorLUT.cc ColorLUT.hh \
-	Accessor.hh DefaultValue.hh \
-	FileUtil.hh FileUtil.cc \
-	EventHandler.hh EventManager.hh EventManager.cc \
-	FbWindow.hh FbWindow.cc Font.cc Font.hh FontImp.hh \
-	I18n.cc I18n.hh \
-	CommandParser.hh \
-	RadioMenuItem.hh \
-	ImageControl.hh ImageControl.cc \
-	LogicCommands.hh LogicCommands.cc \
-	MacroCommand.hh MacroCommand.cc \
-	Menu.hh Menu.cc MenuItem.hh MenuItem.cc \
-	BoolMenuItem.hh IntMenuItem.hh \
-	MultiButtonMenuItem.hh MultiButtonMenuItem.cc \
-	MenuTheme.hh MenuTheme.cc NotCopyable.hh \
-	BorderTheme.hh BorderTheme.cc TextTheme.hh TextTheme.cc \
-	RefCount.hh SimpleCommand.hh \
-	TextUtils.hh TextUtils.cc Orientation.hh \
-	Texture.cc Texture.hh TextureRender.hh TextureRender.cc \
-	Shape.hh Shape.cc \
-	Theme.hh Theme.cc ThemeItems.cc Timer.hh Timer.cc \
-	FbTime.cc FbTime.hh \
-	XFontImp.cc XFontImp.hh \
-	Button.hh Button.cc \
-	TextButton.hh TextButton.cc \
-	Container.hh Container.cc \
-	MultLayers.cc MultLayers.hh \
-	Layer.cc Layer.hh LayerItem.cc LayerItem.hh \
-	Resource.hh Resource.cc \
-	StringUtil.hh StringUtil.cc Parser.hh Parser.cc \
-	RegExp.hh RegExp.cc \
-	FbString.hh FbString.cc \
-	AutoReloadHelper.hh AutoReloadHelper.cc \
-	Transparent.hh Transparent.cc \
-	FbPixmap.hh FbPixmap.cc \
-	FbDrawable.hh FbDrawable.cc \
-	XrmDatabaseHelper.hh \
-	Image.hh Image.cc \
-	PixmapWithMask.hh \
-	Compose.hh CompareEqual.hh \
-	TextBox.hh TextBox.cc \
-	GContext.hh GContext.cc \
-	KeyUtil.hh KeyUtil.cc \
-	MenuSeparator.hh MenuSeparator.cc \
-	stringstream.hh \
-	TypeAhead.hh SearchResult.hh SearchResult.cc ITypeAheadable.hh \
-	Select2nd.hh STLUtil.hh \
-	CachedPixmap.hh CachedPixmap.cc \
-	Slot.hh Signal.hh MemFun.hh SelectArg.hh \
-	Util.hh \
-	RelCalcHelper.hh RelCalcHelper.cc \
-	${xpm_SOURCE} \
-	${xft_SOURCE} \
-	${xmb_SOURCE} \
-	$(imlib2_SOURCE)
--- a/src/FbTk/Makemodule.am
+++ b/src/FbTk/Makemodule.am
@ -0,0 +1,162 @@
+noinst_LIBRARIES = libFbTk.a
+
+if XFT
+xft_SOURCE = \
+	src/FbTk/XftFontImp.hh \
+	src/FbTk/XftFontImp.cc
+endif
+
+if MULTIBYTE
+xmb_SOURCE = \
+	src/FbTk/XmbFontImp.hh \
+	src/FbTk/XmbFontImp.cc
+endif
+
+if XPM
+xpm_SOURCE = \
+	src/FbTk/ImageXPM.hh \
+	src/FbTk/ImageXPM.cc
+endif
+
+if IMLIB2
+imlib2_SOURCE = \
+	src/FbTk/ImageImlib2.hh \
+	src/FbTk/ImageImlib2.cc
+endif
+
+libFbTk_a_CPPFLAGS = \
+	$(FREETYPE2_CFLAGS) \
+	$(FRIBIDI_CFLAGS) \
+	$(AM_CPPFLAGS) \
+	-I$(src_incdir) \
+	-I$(nls_incdir)
+
+libFbTk_a_SOURCES = \
+	$(imlib2_SOURCE) \
+	${xft_SOURCE} \
+	${xmb_SOURCE} \
+	${xpm_SOURCE} \
+	src/FbTk/Accessor.hh \
+	src/FbTk/App.cc \
+	src/FbTk/App.hh \
+	src/FbTk/AutoReloadHelper.cc \
+	src/FbTk/AutoReloadHelper.hh \
+	src/FbTk/BoolMenuItem.hh \
+	src/FbTk/BorderTheme.cc \
+	src/FbTk/BorderTheme.hh \
+	src/FbTk/Button.cc \
+	src/FbTk/Button.hh \
+	src/FbTk/CachedPixmap.cc \
+	src/FbTk/CachedPixmap.hh \
+	src/FbTk/Color.cc \
+	src/FbTk/Color.hh \
+	src/FbTk/ColorLUT.cc \
+	src/FbTk/ColorLUT.hh \
+	src/FbTk/Command.hh \
+	src/FbTk/CommandParser.hh \
+	src/FbTk/CompareEqual.hh \
+	src/FbTk/Compose.hh \
+	src/FbTk/Container.cc \
+	src/FbTk/Container.hh \
+	src/FbTk/DefaultValue.hh \
+	src/FbTk/EventHandler.hh \
+	src/FbTk/EventManager.cc \
+	src/FbTk/EventManager.hh \
+	src/FbTk/FbDrawable.cc \
+	src/FbTk/FbDrawable.hh \
+	src/FbTk/FbPixmap.cc \
+	src/FbTk/FbPixmap.hh \
+	src/FbTk/FbString.cc \
+	src/FbTk/FbString.hh \
+	src/FbTk/FbTime.cc \
+	src/FbTk/FbTime.hh \
+	src/FbTk/FbWindow.cc \
+	src/FbTk/FbWindow.hh \
+	src/FbTk/FileUtil.cc \
+	src/FbTk/FileUtil.hh \
+	src/FbTk/Font.cc \
+	src/FbTk/Font.hh \
+	src/FbTk/FontImp.hh \
+	src/FbTk/GContext.cc \
+	src/FbTk/GContext.hh \
+	src/FbTk/I18n.cc \
+	src/FbTk/I18n.hh \
+	src/FbTk/ITypeAheadable.hh \
+	src/FbTk/Image.cc \
+	src/FbTk/Image.hh \
+	src/FbTk/ImageControl.cc \
+	src/FbTk/ImageControl.hh \
+	src/FbTk/IntMenuItem.hh \
+	src/FbTk/KeyUtil.cc \
+	src/FbTk/KeyUtil.hh \
+	src/FbTk/Layer.cc \
+	src/FbTk/Layer.hh \
+	src/FbTk/LayerItem.cc \
+	src/FbTk/LayerItem.hh \
+	src/FbTk/LogicCommands.cc \
+	src/FbTk/LogicCommands.hh \
+	src/FbTk/MacroCommand.cc \
+	src/FbTk/MacroCommand.hh \
+	src/FbTk/MemFun.hh \
+	src/FbTk/Menu.cc \
+	src/FbTk/Menu.hh \
+	src/FbTk/MenuItem.cc \
+	src/FbTk/MenuItem.hh \
+	src/FbTk/MenuSeparator.cc \
+	src/FbTk/MenuSeparator.hh \
+	src/FbTk/MenuTheme.cc \
+	src/FbTk/MenuTheme.hh \
+	src/FbTk/MultLayers.cc \
+	src/FbTk/MultLayers.hh \
+	src/FbTk/MultiButtonMenuItem.cc \
+	src/FbTk/MultiButtonMenuItem.hh \
+	src/FbTk/NotCopyable.hh \
+	src/FbTk/Orientation.hh \
+	src/FbTk/Parser.cc \
+	src/FbTk/Parser.hh \
+	src/FbTk/PixmapWithMask.hh \
+	src/FbTk/RadioMenuItem.hh \
+	src/FbTk/RefCount.hh \
+	src/FbTk/RegExp.cc \
+	src/FbTk/RegExp.hh \
+	src/FbTk/RelCalcHelper.cc \
+	src/FbTk/RelCalcHelper.hh \
+	src/FbTk/Resource.cc \
+	src/FbTk/Resource.hh \
+	src/FbTk/STLUtil.hh \
+	src/FbTk/SearchResult.cc \
+	src/FbTk/SearchResult.hh \
+	src/FbTk/Select2nd.hh \
+	src/FbTk/SelectArg.hh \
+	src/FbTk/Shape.cc \
+	src/FbTk/Shape.hh \
+	src/FbTk/Signal.hh \
+	src/FbTk/SimpleCommand.hh \
+	src/FbTk/Slot.hh \
+	src/FbTk/StringUtil.cc \
+	src/FbTk/StringUtil.hh \
+	src/FbTk/TextBox.cc \
+	src/FbTk/TextBox.hh \
+	src/FbTk/TextButton.cc \
+	src/FbTk/TextButton.hh \
+	src/FbTk/TextTheme.cc \
+	src/FbTk/TextTheme.hh \
+	src/FbTk/TextUtils.cc \
+	src/FbTk/TextUtils.hh \
+	src/FbTk/Texture.cc \
+	src/FbTk/Texture.hh \
+	src/FbTk/TextureRender.cc \
+	src/FbTk/TextureRender.hh \
+	src/FbTk/Theme.cc \
+	src/FbTk/Theme.hh \
+	src/FbTk/ThemeItems.cc \
+	src/FbTk/Timer.cc \
+	src/FbTk/Timer.hh \
+	src/FbTk/Transparent.cc \
+	src/FbTk/Transparent.hh \
+	src/FbTk/TypeAhead.hh \
+	src/FbTk/Util.hh \
+	src/FbTk/XFontImp.cc \
+	src/FbTk/XFontImp.hh \
+	src/FbTk/XrmDatabaseHelper.hh \
+	src/FbTk/stringstream.hh
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@ -22,17 +22,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.

-//use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include "Menu.hh"

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 #include "MenuItem.hh"
 #include "MenuSeparator.hh"
 #include "ImageControl.hh"
--- a/src/FbTk/RegExp.cc
+++ b/src/FbTk/RegExp.cc
@ -22,11 +22,6 @@

 #include "RegExp.hh"

-//use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include <iostream>

 using std::string;
--- a/src/FbTk/RegExp.hh
+++ b/src/FbTk/RegExp.hh
@ -26,10 +26,6 @@

 #include "NotCopyable.hh"

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <string>

 /*
--- a/src/FbTk/Shape.cc
+++ b/src/FbTk/Shape.cc
@ -26,10 +26,6 @@
 #include "GContext.hh"
 #include "FbPixmap.hh"

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CSTRING
  #include <cstring>
 #else
--- a/src/FbTk/ThemeItems.cc
+++ b/src/FbTk/ThemeItems.cc
@ -24,10 +24,6 @@
 #ifndef THEMEITEMS_HH
 #define THEMEITEMS_HH

-#ifdef    HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include "Theme.hh"
 #include "Color.hh"
 #include "Texture.hh"
--- a/src/FbTk/Timer.cc
+++ b/src/FbTk/Timer.cc
@ -27,11 +27,6 @@
 #include "CommandParser.hh"
 #include "StringUtil.hh"

-//use GNU extensions
-#ifndef	_GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #ifdef HAVE_CASSERT
  #include <cassert>
 #else
--- a/src/FbTk/Timer.hh
+++ b/src/FbTk/Timer.hh
@ -29,10 +29,6 @@
 #include "Command.hh"
 #include "FbTime.hh"

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 #include <string>

 namespace FbTk {
--- a/src/FbTk/Transparent.cc
+++ b/src/FbTk/Transparent.cc
@ -23,10 +23,6 @@
 #include "App.hh"
 #include "I18n.hh"

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_XRENDER
 #include <X11/extensions/Xrender.h>
 #endif // HAVE_XRENDER
--- a/src/FbTk/XftFontImp.cc
+++ b/src/FbTk/XftFontImp.cc
@ -27,10 +27,6 @@
 #include <cstdio>
 #include <algorithm>

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 namespace FbTk {

 XftFontImp::XftFontImp(const char *name, bool utf8):
--- a/src/FbTk/XmbFontImp.cc
+++ b/src/FbTk/XmbFontImp.cc
@ -27,18 +27,10 @@
 #include "FbPixmap.hh"
 #include "GContext.hh"

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif //HAVE_CONFIG_H
-
 #ifdef HAVE_SETLOCALE
 #include <locale.h>
 #endif // HAVE_SETLOCALE

-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #ifdef HAVE_CSTDIO
  #include <cstdio>
 #else
--- a/src/FbTk/stringstream.hh
+++ b/src/FbTk/stringstream.hh
@ -22,10 +22,6 @@
 #ifndef FBTK_STRINGSTREAM_HH
 #define FBTK_STRINGSTREAM_HH

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_SSTREAM
 #include <sstream>
 #define FbTk_istringstream std::istringstream
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@ -32,10 +32,6 @@
 #include "FbTk/ImageControl.hh"
 #include "FbTk/TextUtils.hh"

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xutil.h>
 #ifdef SHAPE
 #include <X11/extensions/shape.h>
--- a/src/Keys.cc
+++ b/src/Keys.cc
@ -40,11 +40,6 @@
 #include "FbTk/AutoReloadHelper.hh"
 #include "FbTk/STLUtil.hh"

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
-
 #ifdef HAVE_CCTYPE
  #include <cctype>
 #else
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -1,183 +0,0 @@
-# Makefile.am for fluxbox
-# Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
-#
-# src/Makefile.am for Blackbox 0.61.x  - an X11 Window manager
-# Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the 
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in 
-# all copies or substantial portions of the Software. 
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
-# DEALINGS IN THE SOFTWARE.
-
-
-if TEST
-BUILD_TEST= tests
-endif
-SUBDIRS= FbTk $(BUILD_TEST)
-
-DEFAULT_MENU=@DEFAULT_MENU@
-DEFAULT_STYLE=@DEFAULT_STYLE@
-DEFAULT_KEYSFILE=@DEFAULT_KEYS@
-DEFAULT_APPSFILE=@DEFAULT_APPS@
-DEFAULT_OVERLAY=@DEFAULT_OVERLAY@
-DEFAULT_INITFILE=@DEFAULT_INIT@
-DEFAULT_WINDOWMENU=@DEFAULT_WINDOWMENU@
-PROGRAM_PREFIX=@program_prefix@
-PROGRAM_SUFFIX=@program_suffix@
-
-AM_CPPFLAGS=
-
-bin_PROGRAMS= fluxbox
-BUILT_SOURCES = defaults.hh defaults.cc
-CONFIG_CLEAN_FILES = defaults.hh defaults.cc
-defaults.hh: Makefile
-	@( \
-		echo '// This file is generated from Makefile. Do not edit!'; \
-		echo '#include <string>'; \
-		echo ''; \
-		echo '#ifdef _WIN32'; \
-		echo '#define DUMMYPREFIX "/DUMMYPREFIX"'; \
-		echo '#define PATHPREFIX DUMMYPREFIX'; \
-		echo '#else'; \
-		echo '#define PATHPREFIX'; \
-		echo '#endif'; \
-		echo '#define CONFIG_VERSION 13'; \
-		echo '#define DEFAULTMENU PATHPREFIX "$(DEFAULT_MENU)"'; \
-		echo '#define DEFAULTSTYLE PATHPREFIX "$(DEFAULT_STYLE)"'; \
-		echo '#define DEFAULTKEYSFILE PATHPREFIX "$(DEFAULT_KEYSFILE)"'; \
-		echo '#define DEFAULT_APPSFILE PATHPREFIX "$(DEFAULT_APPSFILE)"'; \
-		echo '#define DEFAULT_OVERLAY PATHPREFIX "$(DEFAULT_OVERLAY)"'; \
-		echo '#define DEFAULT_INITFILE PATHPREFIX "$(DEFAULT_INITFILE)"'; \
-		echo '#define DEFAULT_WINDOWMENU PATHPREFIX "$(DEFAULT_WINDOWMENU)"'; \
-		echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \
-		echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \
-		echo 'std::string realProgramName(const std::string& name);'; \
-		echo 'const char* gitrevision();' ) > defaults.hh
-
-defaults.cc: force
-	@( \
-		GITDIR=$(top_srcdir)/.git; \
-		echo '// This file is generated from Makefile. Do not edit!'; \
-		echo '#include "defaults.hh"'; \
-		echo ''; \
-		echo 'std::string realProgramName(const std::string& name) {'; \
-		echo '  return PROGRAM_PREFIX + name + PROGRAM_SUFFIX;'; \
-		echo '}'; \
-		echo ''; \
-		echo 'const char* gitrevision() {'; \
-		if test -r $$GITDIR/HEAD; then \
-			echo '  return "'`cat $$GITDIR/$$(cat $$GITDIR/HEAD | cut -f 2 -d ' ')`'";'; \
-		else \
-			echo '  return "this_is_tar_ball_build";'; \
-		fi; \
-		echo '}' ) > defaults_tmp.cc
-	@if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi
-	@rm defaults_tmp.cc
-
-force: ;
-
-# an extra dep for fluxbox
-fluxbox.$(OBJEXT): defaults.hh
-
-
-
-if EWMH
-EWMH_SOURCE= Ewmh.hh Ewmh.cc
-endif
-if REMEMBER_SRC
-REMEMBER_SOURCE= Remember.hh Remember.cc
-endif
-if TOOLBAR_SRC
-TOOLBAR_SOURCE = Toolbar.hh Toolbar.cc \
-	ToolbarTheme.hh ToolbarTheme.cc ToolbarItem.hh ToolbarItem.cc \
-	ClockTool.hh ClockTool.cc \
-	WorkspaceNameTool.hh WorkspaceNameTool.cc WorkspaceNameTheme.hh \
-	IconbarTool.hh IconbarTool.cc \
-	ToolTheme.hh ToolTheme.cc \
-	GenericTool.hh GenericTool.cc \
-	ButtonTool.hh ButtonTool.cc ButtonTheme.hh ButtonTheme.cc \
-	ToolFactory.hh ToolFactory.cc
-if SYSTRAY_SRC
-TOOLBAR_SOURCE += SystemTray.hh SystemTray.cc
-endif
-endif
-
-
-if SLIT_SRC
-SLIT_SOURCE = Slit.cc Slit.hh SlitTheme.hh SlitTheme.cc SlitClient.hh SlitClient.cc
-endif
-
-fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
-	FbAtoms.hh FbAtoms.cc FbWinFrame.hh FbWinFrame.cc \
-	FbWinFrameTheme.hh FbWinFrameTheme.cc \
-	fluxbox.cc fluxbox.hh \
-	Keys.cc Keys.hh \
-	main.cc \
-	cli.hh cli_cfiles.cc cli_options.cc cli_info.cc \
-	RootTheme.hh RootTheme.cc \
-	FbRootWindow.hh FbRootWindow.cc \
-	OSDWindow.hh OSDWindow.cc \
-	TooltipWindow.hh TooltipWindow.cc \
-	Screen.cc Screen.hh \
-	WinButton.hh WinButton.cc \
-	WinButtonTheme.hh WinButtonTheme.cc \
-	Window.cc Window.hh WindowState.cc WindowState.hh\
-	Workspace.cc Workspace.hh \
-	FbCommands.hh FbCommands.cc LayerMenu.hh LayerMenu.cc \
-	Layer.hh \
-	FbMenu.hh FbMenu.cc \
-	WinClient.hh WinClient.cc \
-	Strut.hh \
-	Xinerama.hh \
-	Xutil.hh Xutil.cc \
-	CurrentWindowCmd.hh CurrentWindowCmd.cc \
-	WorkspaceCmd.hh WorkspaceCmd.cc \
-	TextDialog.hh TextDialog.cc \
-	CommandDialog.hh CommandDialog.cc SendToMenu.hh SendToMenu.cc \
-	AlphaMenu.hh AlphaMenu.cc \
-	FbMenuParser.hh FbMenuParser.cc \
-	StyleMenuItem.hh StyleMenuItem.cc \
-	RootCmdMenuItem.hh RootCmdMenuItem.cc\
-	MenuCreator.hh MenuCreator.cc \
-	ClientMenu.hh ClientMenu.cc \
-	ClientPattern.hh ClientPattern.cc \
-	WorkspaceMenu.hh WorkspaceMenu.cc \
-	FocusModelMenuItem.hh \
-	ToggleMenu.hh \
-	HeadArea.hh HeadArea.cc \
-	Resources.cc \
-	WindowCmd.hh WindowCmd.cc \
-	FocusControl.hh FocusControl.cc \
-	PlacementStrategy.hh \
-	CascadePlacement.hh CascadePlacement.cc \
-	ColSmartPlacement.hh ColSmartPlacement.cc \
-	MinOverlapPlacement.hh MinOverlapPlacement.cc \
-	RowSmartPlacement.hh RowSmartPlacement.cc \
-	ScreenPlacement.hh ScreenPlacement.cc \
-	UnderMousePlacement.hh UnderMousePlacement.cc \
-	AttentionNoticeHandler.hh AttentionNoticeHandler.cc \
-	IconButton.hh IconButton.cc \
-	IconbarTheme.hh IconbarTheme.cc \
-	Focusable.hh FocusableList.hh FocusableList.cc FocusableTheme.hh \
-	WindowMenuAccessor.hh \
-	RectangleUtil.hh \
-	Debug.hh \
-	${EWMH_SOURCE} \
-	${REMEMBER_SOURCE} \
-	${SLIT_SOURCE} \
-	${TOOLBAR_SOURCE}
-
-LDADD=FbTk/libFbTk.a defaults.$(OBJEXT)
--- a/src/Makemodule.am
+++ b/src/Makemodule.am
@ -0,0 +1,275 @@
+# Makefile.am for fluxbox
+# Copyright (c) 2001 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+#
+# src/Makefile.am for Blackbox 0.61.x  - an X11 Window manager
+# Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+BUILT_SOURCES = src/defaults.hh src/defaults.cc
+CONFIG_CLEAN_FILES = src/defaults.hh src/defaults.cc
+
+bin_PROGRAMS += fluxbox
+
+src/defaults.hh:
+	@( \
+		echo '// This file is generated from Makefile. Do not edit!'; \
+		echo '#include <string>'; \
+		echo ''; \
+		echo '#ifdef _WIN32'; \
+		echo '#define DUMMYPREFIX "/DUMMYPREFIX"'; \
+		echo '#define PATHPREFIX DUMMYPREFIX'; \
+		echo '#else'; \
+		echo '#define PATHPREFIX'; \
+		echo '#endif'; \
+		echo '#define CONFIG_VERSION 13'; \
+		echo '#define DEFAULTMENU PATHPREFIX "$(DEFAULT_MENU)"'; \
+		echo '#define DEFAULTSTYLE PATHPREFIX "$(DEFAULT_STYLE)"'; \
+		echo '#define DEFAULTKEYSFILE PATHPREFIX "$(DEFAULT_KEYSFILE)"'; \
+		echo '#define DEFAULT_APPSFILE PATHPREFIX "$(DEFAULT_APPSFILE)"'; \
+		echo '#define DEFAULT_OVERLAY PATHPREFIX "$(DEFAULT_OVERLAY)"'; \
+		echo '#define DEFAULT_INITFILE PATHPREFIX "$(DEFAULT_INITFILE)"'; \
+		echo '#define DEFAULT_WINDOWMENU PATHPREFIX "$(DEFAULT_WINDOWMENU)"'; \
+		echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \
+		echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \
+		echo 'std::string realProgramName(const std::string& name);'; \
+		echo 'const char* gitrevision();' ) > $(top_builddir)/src/defaults.hh
+
+src/defaults.cc: force
+	@( \
+		GITDIR=$(top_srcdir)/.git; \
+		echo '// This file is generated from Makefile. Do not edit!'; \
+		echo '#include "defaults.hh"'; \
+		echo ''; \
+		echo 'std::string realProgramName(const std::string& name) {'; \
+		echo '  return PROGRAM_PREFIX + name + PROGRAM_SUFFIX;'; \
+		echo '}'; \
+		echo ''; \
+		echo 'const char* gitrevision() {'; \
+		if test -r $$GITDIR/HEAD; then \
+			echo '  return "'`cat $$GITDIR/$$(cat $$GITDIR/HEAD | cut -f 2 -d ' ')`'";'; \
+		else \
+			echo '  return "this_is_tar_ball_build";'; \
+		fi; \
+		echo '}' ) > $(top_builddir)/src/defaults_tmp.cc
+	@if ! cmp defaults_tmp.cc defaults.cc ; then cp $(top_builddir)/src/defaults_tmp.cc $(top_builddir)/src/defaults.cc; fi
+	@rm $(top_builddir)/src/defaults_tmp.cc
+
+force: ;
+
+# an extra dep for fluxbox
+fluxbox.$(OBJEXT): src/defaults.hh
+
+if EWMH
+EWMH_SOURCE = \
+	src/Ewmh.hh \
+	src/Ewmh.cc
+endif
+
+if REMEMBER_SRC
+REMEMBER_SOURCE = \
+	src/Remember.hh \
+	src/Remember.cc
+endif
+
+if TOOLBAR_SRC
+TOOLBAR_SOURCE = \
+	src/ButtonTheme.cc \
+	src/ButtonTheme.hh \
+	src/ButtonTool.cc \
+	src/ButtonTool.hh \
+	src/ClockTool.cc \
+	src/ClockTool.hh \
+	src/GenericTool.cc \
+	src/GenericTool.hh \
+	src/IconbarTool.cc \
+	src/IconbarTool.hh \
+	src/ToolFactory.cc \
+	src/ToolFactory.hh \
+	src/ToolTheme.cc \
+	src/ToolTheme.hh \
+	src/Toolbar.cc \
+	src/Toolbar.hh \
+	src/ToolbarItem.cc \
+	src/ToolbarItem.hh \
+	src/ToolbarTheme.cc \
+	src/ToolbarTheme.hh \
+	src/WorkspaceNameTheme.hh \
+	src/WorkspaceNameTool.cc \
+	src/WorkspaceNameTool.hh
+if SYSTRAY_SRC
+TOOLBAR_SOURCE += \
+	src/SystemTray.cc \
+	src/SystemTray.hh
+endif
+endif
+
+if SLIT_SRC
+SLIT_SOURCE = \
+	src/Slit.cc \
+	src/Slit.hh \
+	src/SlitClient.cc \
+	src/SlitClient.hh \
+	src/SlitTheme.cc \
+	src/SlitTheme.hh
+endif
+
+fluxbox_CPPFLAGS = \
+	$(FRIBIDI_CFLAGS) \
+	$(XRANDR_CFLAGS) \
+	$(AM_CPPFLAGS) \
+	-I$(src_incdir) \
+	-I$(fbtk_incdir) \
+	-I$(nls_incdir)
+
+fluxbox_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FREETYPE2_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(IMLIB2_LIBS) \
+	$(RANDR_LIBS) \
+	$(X11_LIBS) \
+	$(XEXT_LIBS) \
+	$(XFT_LIBS) \
+	$(XINERAMA_LIBS) \
+	$(XPM_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_EXTRA_LIBS) \
+	$(X_LIBS) \
+	$(X_PRE_LIBS)
+
+fluxbox_SOURCES = \
+	src/AlphaMenu.cc \
+	src/AlphaMenu.hh \
+	src/ArrowButton.cc \
+	src/ArrowButton.hh \
+	src/AtomHandler.hh \
+	src/AttentionNoticeHandler.cc \
+	src/AttentionNoticeHandler.hh \
+	src/CascadePlacement.cc \
+	src/CascadePlacement.hh \
+	src/ClientMenu.cc \
+	src/ClientMenu.hh \
+	src/ClientPattern.cc \
+	src/ClientPattern.hh \
+	src/ColSmartPlacement.cc \
+	src/ColSmartPlacement.hh \
+	src/CommandDialog.cc \
+	src/CommandDialog.hh \
+	src/CurrentWindowCmd.cc \
+	src/CurrentWindowCmd.hh \
+	src/Debug.hh \
+	src/FbAtoms.cc \
+	src/FbAtoms.hh \
+	src/FbCommands.cc \
+	src/FbCommands.hh \
+	src/FbMenu.cc \
+	src/FbMenu.hh \
+	src/FbMenuParser.cc \
+	src/FbMenuParser.hh \
+	src/FbRootWindow.cc \
+	src/FbRootWindow.hh \
+	src/FbWinFrame.cc \
+	src/FbWinFrame.hh \
+	src/FbWinFrameTheme.cc \
+	src/FbWinFrameTheme.hh \
+	src/FocusControl.cc \
+	src/FocusControl.hh \
+	src/FocusModelMenuItem.hh \
+	src/Focusable.hh \
+	src/FocusableList.cc \
+	src/FocusableList.hh \
+	src/FocusableTheme.hh \
+	src/HeadArea.cc \
+	src/HeadArea.hh \
+	src/IconButton.cc \
+	src/IconButton.hh \
+	src/IconbarTheme.cc \
+	src/IconbarTheme.hh \
+	src/Keys.cc \
+	src/Keys.hh \
+	src/Layer.hh \
+	src/LayerMenu.cc \
+	src/LayerMenu.hh \
+	src/MenuCreator.cc \
+	src/MenuCreator.hh \
+	src/MinOverlapPlacement.cc \
+	src/MinOverlapPlacement.hh \
+	src/OSDWindow.cc \
+	src/OSDWindow.hh \
+	src/PlacementStrategy.hh \
+	src/RectangleUtil.hh \
+	src/Resources.cc \
+	src/RootCmdMenuItem.cc\
+	src/RootCmdMenuItem.hh \
+	src/RootTheme.cc \
+	src/RootTheme.hh \
+	src/RowSmartPlacement.cc \
+	src/RowSmartPlacement.hh \
+	src/Screen.cc \
+	src/Screen.hh \
+	src/ScreenPlacement.cc \
+	src/ScreenPlacement.hh \
+	src/SendToMenu.cc \
+	src/SendToMenu.hh \
+	src/Strut.hh \
+	src/StyleMenuItem.cc \
+	src/StyleMenuItem.hh \
+	src/TextDialog.cc \
+	src/TextDialog.hh \
+	src/ToggleMenu.hh \
+	src/TooltipWindow.cc \
+	src/TooltipWindow.hh \
+	src/UnderMousePlacement.cc \
+	src/UnderMousePlacement.hh \
+	src/WinButton.cc \
+	src/WinButton.hh \
+	src/WinButtonTheme.cc \
+	src/WinButtonTheme.hh \
+	src/WinClient.cc \
+	src/WinClient.hh \
+	src/Window.cc \
+	src/Window.hh \
+	src/WindowCmd.cc \
+	src/WindowCmd.hh \
+	src/WindowMenuAccessor.hh \
+	src/WindowState.cc \
+	src/WindowState.hh\
+	src/Workspace.cc \
+	src/Workspace.hh \
+	src/WorkspaceCmd.cc \
+	src/WorkspaceCmd.hh \
+	src/WorkspaceMenu.cc \
+	src/WorkspaceMenu.hh \
+	src/Xinerama.hh \
+	src/Xutil.cc \
+	src/Xutil.hh \
+	src/fluxbox.cc \
+	src/fluxbox.hh \
+	src/main.cc \
+	src/cli.hh \
+	src/cli_cfiles.cc \
+	src/cli_options.cc \
+	src/cli_info.cc \
+	${EWMH_SOURCE} \
+	${REMEMBER_SOURCE} \
+	${SLIT_SOURCE} \
+	${TOOLBAR_SOURCE}
+
+LDADD = libFbTk.a src/defaults.$(OBJEXT)
--- a/src/Remember.cc
+++ b/src/Remember.cc
@ -49,11 +49,6 @@
  #include <string.h>
 #endif

-//use GNU extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include <set>


--- a/src/Screen.cc
+++ b/src/Screen.cc
@ -77,15 +77,6 @@
 #include "FbTk/KeyUtil.hh"
 #include "FbTk/Util.hh"

-//use GNU extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef USE_SLIT
 #include "Slit.hh"
 #include "SlitClient.hh"
@ -401,21 +392,18 @@ BScreen::BScreen(FbTk::ResourceManager &rm,


 // setup RANDR for this screens root window
-#if defined(HAVE_RANDR1_2)
+#if defined(HAVE_RANDR)
    int randr_mask = RRScreenChangeNotifyMask;
-#ifdef RRCrtcChangeNotifyMask
+# ifdef RRCrtcChangeNotifyMask
    randr_mask |= RRCrtcChangeNotifyMask;
-#endif
-#ifdef RROutputChangeNotifyMask
+# endif
+# ifdef RROutputChangeNotifyMask
    randr_mask |= RROutputChangeNotifyMask;
-#endif
-#ifdef RROutputPropertyNotifyMask
+# endif
+# ifdef RROutputPropertyNotifyMask
    randr_mask |= RROutputPropertyNotifyMask;
-#endif
+# endif
    XRRSelectInput(disp, rootWindow().window(), randr_mask);
-
-#elif defined(HAVE_RANDR)
-    XRRScreenChangeSelectInput(disp, rootWindow().window(), True);
 #endif // HAVE_RANDR


--- a/src/Slit.cc
+++ b/src/Slit.cc
@ -24,15 +24,6 @@

 #include "Slit.hh"

-//use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include "Screen.hh"
 #include "ScreenPlacement.hh"
 #include "FbTk/ImageControl.hh"
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@ -55,15 +55,6 @@
 #include "FbTk/STLUtil.hh"
 #include "FbTk/Util.hh"

-// use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xutil.h>
 #include <X11/keysym.h>

--- a/src/Window.cc
+++ b/src/Window.cc
@ -55,18 +55,10 @@
 #include "FbTk/Select2nd.hh"
 #include "FbTk/MemFun.hh"

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
 #ifdef SHAPE
 #include <X11/extensions/shape.h>
 #endif // SHAPE

-//use GNU extensions
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include <X11/Xatom.h>
 #include <X11/keysym.h>

--- a/src/WindowState.cc
+++ b/src/WindowState.cc
@ -23,10 +23,6 @@

 #include "FbTk/StringUtil.hh"

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CSTDLIB
  #include <cstdlib>
 #else
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@ -36,15 +36,6 @@
 #include "FbTk/FbString.hh"
 #include "FbTk/MemFun.hh"

-// use GNU extensions
-#ifndef  _GNU_SOURCE
-#define  _GNU_SOURCE
-#endif // _GNU_SOURCE
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>

--- a/src/cli_cfiles.cc
+++ b/src/cli_cfiles.cc
@ -28,10 +28,6 @@
 #include "FbTk/Resource.hh"
 #include "FbTk/StringUtil.hh"

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_CSTRING
  #include <cstring>
 #else
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@ -57,15 +57,6 @@
 #include "FbTk/KeyUtil.hh"
 #include "FbTk/MemFun.hh"

-//Use GNU extensions
-#ifndef	 _GNU_SOURCE
-#define	 _GNU_SOURCE
-#endif // _GNU_SOURCE
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef USE_EWMH
 #include "Ewmh.hh"
 #endif // USE_EWMH
--- a/src/main.cc
+++ b/src/main.cc
@ -20,10 +20,6 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #include "fluxbox.hh"
 #include "version.h"
 #include "defaults.hh"
@ -37,6 +33,18 @@
 #define	 _GNU_SOURCE
 #endif // _GNU_SOURCE

+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
+
+#ifdef HAVE_CSTRING
+  #include <cstring>
+#else
+  #include <string.h>
+#endif
+
 #ifdef HAVE_UNISTD_H
  #include <unistd.h>
 #endif
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@ -1,22 +0,0 @@
-AM_CPPFLAGS= -I$(top_srcdir)/src
-
-noinst_PROGRAMS= \
-	 testTexture \
-	 testFont \
-	 testKeys \
-	 testDemandAttention \
-	 testFullscreen \
-	 testStringUtil \
-	 testRectangleUtil
-
-testTexture_SOURCES         = texturetest.cc
-testFont_SOURCES            = testFont.cc
-testKeys_SOURCES            = testKeys.cc
-testDemandAttention_SOURCES = testDemandAttention.cc
-#testResource_SOURCES        = Resourcetest.cc
-testFullscreen_SOURCES      = fullscreentest.cc
-testStringUtil_SOURCES      = StringUtiltest.cc
-testRectangleUtil_SOURCES   = testRectangleUtil.cc
-
-LDADD=../FbTk/libFbTk.a
-
--- a/src/tests/Makemodule.am
+++ b/src/tests/Makemodule.am
@ -0,0 +1,104 @@
+check_PROGRAMS= \
+	testDemandAttention \
+	testFont \
+	testFullscreen \
+	testKeys \
+	testRectangleUtil \
+	testSignals \
+	testStringUtil \
+	testTexture
+
+testDemandAttention_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+testDemandAttention_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+testDemandAttention_SOURCES = \
+	src/tests/testDemandAttention.cc
+
+testFont_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+testFont_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+testFont_SOURCES = \
+	src/tests/testFont.cc
+
+testFullscreen_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+testFullscreen_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir) \
+	-I$(src_incdir)
+testFullscreen_SOURCES = \
+	src/tests/fullscreentest.cc
+
+testKeys_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+testKeys_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+testKeys_SOURCES = \
+	src/tests/testKeys.cc
+
+testRectangleUtil_SOURCES = \
+	src/RectangleUtil.hh \
+	src/tests/testRectangleUtil.cc
+testRectangleUtil_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir)/src
+
+testSignals_LDFLAGS = \
+	$(FRIBIDI_LIBS) \
+	$(X11_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+
+testSignals_SOURCES = \
+	src/tests/testSignals.cc
+testSignals_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+
+testStringUtil_SOURCES = \
+	src/tests/StringUtiltest.cc
+testStringUtil_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+
+testTexture_LDFLAGS = \
+	$(FONTCONFIG_LIBS) \
+	$(FRIBIDI_LIBS) \
+	$(IMLIB2_LIBS) \
+	$(X11_LIBS) \
+	$(XFT_LIBS) \
+	$(XPM_LIBS) \
+	$(XRENDER_LIBS) \
+	$(X_LIBS)
+testTexture_SOURCES = \
+	src/tests/texturetest.cc
+testTexture_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(fbtk_incdir)
+
+#testResource_SOURCE = Resourcetest.cc
--- a/src/tests/Resourcetest.cc
+++ b/src/tests/Resourcetest.cc
@ -21,11 +21,6 @@

 #include "Resource.hh"

-//use of strcasecmp 
-#ifndef   _GNU_SOURCE
-#define   _GNU_SOURCE
-#endif // _GNU_SOURCE
-
 #include <string>
 #include <iostream>
 #ifdef HAVE_CSTDIO
--- a/src/tests/StringUtiltest.cc
+++ b/src/tests/StringUtiltest.cc
@ -20,9 +20,6 @@
 // DEALINGS IN THE SOFTWARE.

 #include "FbTk/StringUtil.hh"
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif //_GNU_SOURCE

 #include <cstring>
 #include <cstdlib>
--- a/stamp-h.in
+++ b/stamp-h.in
@ -1 +0,0 @@
-timestamp
--- a/Show more
+++ b/Show more