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

17 files changed, 37 insertions, 156 deletions

diff --git a/plugins/.cvsignore b/plugins/.cvsignore
index 4e780f86..96381e2d 100644
--- a/plugins/.cvsignore
+++ b/plugins/.cvsignore
@@ -1,7 +1,2 @@
-resistance.la
 .libs
-resistance.lo
-Makefile.in
 .deps
-resistance_la-resistance.lo
-Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
deleted file mode 100644
index 3d623b21..00000000
--- a/plugins/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBDIRS = keyboard mouse placement menu resistance
-
-EXTRA_DIST = interface.h obconf_interface.h
-
-MAINTAINERCLEANFILES= Makefile.in
-
-distclean-local:
-	$(RM) *\~ *.orig *.rej .\#*
diff --git a/plugins/keyboard/.cvsignore b/plugins/keyboard/.cvsignore
index 953f4184..2d55ccb0 100644
--- a/plugins/keyboard/.cvsignore
+++ b/plugins/keyboard/.cvsignore
@@ -1,10 +1,7 @@
-keyboard.lo
 keyboard.la
-tree.lo
-translate.lo
-keyaction.lo
 .libs
-keyparse.lo
-Makefile.in
 .deps
-Makefile
+.dirstamp
+plugins_keyboard_keyboard_la-keyboard.lo
+plugins_keyboard_keyboard_la-translate.lo
+plugins_keyboard_keyboard_la-tree.lo
diff --git a/plugins/keyboard/Makefile b/plugins/keyboard/Makefile
new file mode 100644
index 00000000..cfc46539
--- /dev/null
+++ b/plugins/keyboard/Makefile
@@ -0,0 +1,4 @@
+all clean install:
+	$(MAKE) -C ../.. -$(MAKEFLAGS) $@
+
+.PHONY: all clean install
diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
deleted file mode 100644
index 82ed50b4..00000000
--- a/plugins/keyboard/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-plugindir=$(libdir)/openbox/plugins
-
-AM_CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) \
-            $(XML_CFLAGS) \
-            -DG_LOG_DOMAIN=\"Plugin-Keyboard\"
-
-INCLUDES=-I../..
-
-plugin_LTLIBRARIES=keyboard.la
-
-keyboard_la_LDFLAGS=-module -avoid-version
-keyboard_la_SOURCES=\
-  keyboard.h \
-  keyboard.c \
-  translate.h \
-  translate.c \
-  tree.h \
-  tree.c
-
-MAINTAINERCLEANFILES=Makefile.in
-
-distclean-local:
-	$(RM) *\~ *.orig *.rej .\#*
diff --git a/plugins/menu/.cvsignore b/plugins/menu/.cvsignore
index df44dd6c..c2fe749e 100644
--- a/plugins/menu/.cvsignore
+++ b/plugins/menu/.cvsignore
@@ -1,10 +1,9 @@
 .deps
 .libs
-Makefile
-Makefile.in
 timed_menu.la
-timed_menu.lo
 fifo_menu.la
-fifo_menu.lo
 client_menu.la
-client_menu.lo
+.dirstamp
+plugins_menu_client_menu_la-client_menu.lo
+plugins_menu_fifo_menu_la-fifo_menu.lo
+plugins_menu_timed_menu_la-timed_menu.lo
diff --git a/plugins/menu/Makefile b/plugins/menu/Makefile
new file mode 100644
index 00000000..cfc46539
--- /dev/null
+++ b/plugins/menu/Makefile
@@ -0,0 +1,4 @@
+all clean install:
+	$(MAKE) -C ../.. -$(MAKEFLAGS) $@
+
+.PHONY: all clean install
diff --git a/plugins/menu/Makefile.am b/plugins/menu/Makefile.am
deleted file mode 100644
index 84b18bfb..00000000
--- a/plugins/menu/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-plugindir=$(libdir)/openbox/plugins
-
-AM_CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(XML_CFLAGS) \
-            -DG_LOG_DOMAIN=\"Plugin-Timed-Menu\"
-
-INCLUDES=-I../..
-
-#plugin_LTLIBRARIES=timed_menu.la fifo_menu.la client_menu.la
-
-#timed_menu_la_LDFLAGS=-module -avoid-version
-#timed_menu_la_SOURCES=timed_menu.c timed_menu.h
-
-#fifo_menu_la_LDFLAGS=-module -avoid-version
-#fifo_menu_la_SOURCES=fifo_menu.c fifo_menu.h
-
-#client_menu_la_LDFLAGS=-module -avoid-version
-#client_menu_la_SOURCES=client_menu.c
-
-MAINTAINERCLEANFILES=Makefile.in
-
-distclean-local:
-	$(RM) *\~ *.orig *.rej .\#*
diff --git a/plugins/mouse/.cvsignore b/plugins/mouse/.cvsignore
index ed5c2905..9d1b8607 100644
--- a/plugins/mouse/.cvsignore
+++ b/plugins/mouse/.cvsignore
@@ -1,8 +1,6 @@
-mouse.lo
 mouse.la
-translate.lo
-mouseparse.lo
 .libs
-Makefile.in
 .deps
-Makefile
+.dirstamp
+plugins_mouse_mouse_la-mouse.lo
+plugins_mouse_mouse_la-translate.lo
diff --git a/plugins/mouse/Makefile b/plugins/mouse/Makefile
new file mode 100644
index 00000000..cfc46539
--- /dev/null
+++ b/plugins/mouse/Makefile
@@ -0,0 +1,4 @@
+all clean install:
+	$(MAKE) -C ../.. -$(MAKEFLAGS) $@
+
+.PHONY: all clean install
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
deleted file mode 100644
index 5595fe69..00000000
--- a/plugins/mouse/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-plugindir=$(libdir)/openbox/plugins
-
-AM_CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) \
-            $(XML_CFLAGS)  \
-            -DG_LOG_DOMAIN=\"Plugin-Mouse\"
-
-INCLUDES=-I../..
-
-plugin_LTLIBRARIES=mouse.la
-
-mouse_la_LDFLAGS=-module -avoid-version
-mouse_la_SOURCES=\
-  mouse.h \
-  mouse.c \
-  translate.h \
-  translate.c
-
-noinst_HEADERS=mouse.h translate.h
-
-MAINTAINERCLEANFILES=Makefile.in
-
-distclean-local:
-	$(RM) *\~ *.orig *.rej .\#*
diff --git a/plugins/placement/.cvsignore b/plugins/placement/.cvsignore
index c2a167d8..991f13fe 100644
--- a/plugins/placement/.cvsignore
+++ b/plugins/placement/.cvsignore
@@ -1,7 +1,6 @@
 placement.la
-placement.lo
-history.lo
 .libs
-Makefile.in
 .deps
-Makefile
+.dirstamp
+plugins_placement_placement_la-history.lo
+plugins_placement_placement_la-placement.lo
diff --git a/plugins/placement/Makefile b/plugins/placement/Makefile
new file mode 100644
index 00000000..cfc46539
--- /dev/null
+++ b/plugins/placement/Makefile
@@ -0,0 +1,4 @@
+all clean install:
+	$(MAKE) -C ../.. -$(MAKEFLAGS) $@
+
+.PHONY: all clean install
diff --git a/plugins/placement/Makefile.am b/plugins/placement/Makefile.am
deleted file mode 100644
index 58fa1fa7..00000000
--- a/plugins/placement/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-plugindir=$(libdir)/openbox/plugins
-
-AM_CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) \
-            $(XML_CFLAGS) \
-            -DG_LOG_DOMAIN=\"Plugin-Placement\"
-
-INCLUDES=-I../..
-
-plugin_LTLIBRARIES=placement.la
-
-placement_la_LDFLAGS=-module -avoid-version
-placement_la_SOURCES=history.c history.h placement.c
-
-MAINTAINERCLEANFILES=Makefile.in
-
-distclean-local:
-	$(RM) *\~ *.orig *.rej .\#*
diff --git a/plugins/resistance/.cvsignore b/plugins/resistance/.cvsignore
index fe97c5fa..4b63246e 100644
--- a/plugins/resistance/.cvsignore
+++ b/plugins/resistance/.cvsignore
@@ -1,8 +1,7 @@
 .deps
 .libs
-Makefile
-Makefile.in
 resistance-config.la
 resistance.la
-resistance_config_la-resistance_config.lo
-resistance_la-resistance.lo
+.dirstamp
+plugins_resistance_resistance_la-resistance.lo
+plugins_resistance_resistance_config_la-resistance_config.lo
diff --git a/plugins/resistance/Makefile b/plugins/resistance/Makefile
new file mode 100644
index 00000000..cfc46539
--- /dev/null
+++ b/plugins/resistance/Makefile
@@ -0,0 +1,4 @@
+all clean install:
+	$(MAKE) -C ../.. -$(MAKEFLAGS) $@
+
+.PHONY: all clean install
diff --git a/plugins/resistance/Makefile.am b/plugins/resistance/Makefile.am
deleted file mode 100644
index 7ef2ea9f..00000000
--- a/plugins/resistance/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-plugindir=$(libdir)/openbox/plugins
-
-AM_CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) \
-            $(XML_CFLAGS) \
-            -DPLUGINDIR=\"$(plugindir)\"
-
-INCLUDES=-I../.. -I../../tools
-
-plugin_LTLIBRARIES=resistance.la
-if OBCONF
-plugin_LTLIBRARIES+=resistance-config.la
-endif
-
-resistance_la_CPPFLAGS=$(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"Plugin-Resistance\"
-resistance_la_LDFLAGS=-module -avoid-version
-resistance_la_SOURCES=resistance.c resistance.h
-
-if OBCONF
-resistance_config_la_CPPFLAGS=$(AM_CPPFLAGS) \
-                              -DG_LOG_DOMAIN=\"Plugin-Resistance\" \
-                              $(GTK_CFLAGS) $(GLADE_CFLAGS)
-resistance_config_la_LDFLAGS=-module -avoid-version
-resistance_config_la_SOURCES=resistance_config.c
-endif
-
-noinst_DATA=resistance.glade resistance.gladep
-
-EXTRA_DIST=$(noinst_DATA)
-
-MAINTAINERCLEANFILES= Makefile.in
-
-distclean-local:
-	$(RM) *\~ *.orig *.rej .\#*