update the build system, using a single Makefile.am for a sexyass non-recursive make. booyah!

9 files changed, 4 insertions, 64 deletions

diff --git a/themes/.cvsignore b/themes/.cvsignore
index 3dda7298..e69de29b 100644
--- a/themes/.cvsignore
+++ b/themes/.cvsignore
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/themes/Makefile b/themes/Makefile
new file mode 100644
index 00000000..b90edacf
--- /dev/null
+++ b/themes/Makefile
@@ -0,0 +1,4 @@
+all clean install:
+	$(MAKE) -C .. -$(MAKEFLAGS) $@
+
+.PHONY: all clean install
diff --git a/themes/Makefile.am b/themes/Makefile.am
deleted file mode 100644
index 381b9d1b..00000000
--- a/themes/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-themedir=$(datadir)/openbox/themes
-
-SUBDIRS=ebox_data fieron_data fieron2_data
-
-theme_DATA=artwiz bbs bluebox cthulhain deep ebox fieron fieron2 flux frobozz \
-           frobust mbdtex miklos nyz nyzclone ob20 operation outcomes paper \
-           purplehaaze shade steelblue steelblue2 the_orange trisb twice \
-           warp-xp
-
-EXTRA_DIST=$(theme_DATA)
-
-MAINTAINERCLEANFILES=Makefile.in
-
-distclean-local:
-	$(RM) *\~ *.orig *.rej .\#*
diff --git a/themes/ebox_data/.cvsignore b/themes/ebox_data/.cvsignore
index 282522db..e69de29b 100644
--- a/themes/ebox_data/.cvsignore
+++ b/themes/ebox_data/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/themes/ebox_data/Makefile.am b/themes/ebox_data/Makefile.am
deleted file mode 100644
index a03f8153..00000000
--- a/themes/ebox_data/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-themedatadir=$(datadir)/openbox/themes/ebox_data
-
-themedata_DATA=\
-  close.xbm \
-  iconify.xbm \
-  max.xbm
-
-EXTRA_DIST=$(themedata_DATA)
-
-MAINTAINERCLEANFILES=Makefile.in
-
-distclean-local:
-	$(RM) *\~ *.orig *.rej .\#*
diff --git a/themes/fieron2_data/.cvsignore b/themes/fieron2_data/.cvsignore
index 282522db..e69de29b 100644
--- a/themes/fieron2_data/.cvsignore
+++ b/themes/fieron2_data/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/themes/fieron2_data/Makefile.am b/themes/fieron2_data/Makefile.am
deleted file mode 100644
index 3309af5c..00000000
--- a/themes/fieron2_data/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-themedatadir=$(datadir)/openbox/themes/fieron2_data
-
-themedata_DATA=\
-  close.xbm \
-  iconify.xbm \
-  max.xbm \
-  stick.xbm
-
-EXTRA_DIST=$(themedata_DATA)
-
-MAINTAINERCLEANFILES=Makefile.in
-
-distclean-local:
-	$(RM) *\~ *.orig *.rej .\#*
diff --git a/themes/fieron_data/.cvsignore b/themes/fieron_data/.cvsignore
index 282522db..e69de29b 100644
--- a/themes/fieron_data/.cvsignore
+++ b/themes/fieron_data/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/themes/fieron_data/Makefile.am b/themes/fieron_data/Makefile.am
deleted file mode 100644
index 0f35e1ab..00000000
--- a/themes/fieron_data/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-themedatadir=$(datadir)/openbox/themes/fieron_data
-
-themedata_DATA=\
-  close.xbm \
-  iconify.xbm \
-  max.xbm \
-  stick.xbm
-
-EXTRA_DIST=$(themedata_DATA)
-
-MAINTAINERCLEANFILES=Makefile.in
-
-distclean-local:
-	$(RM) *\~ *.orig *.rej .\#*