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

3 files changed, 7 insertions, 37 deletions

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 .\#*