merge Sami Kerola's new build-system

1 files changed, 0 insertions, 59 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