12 files changed, 84 insertions, 16 deletions
diff --git a/plugins/.cvsignore b/plugins/.cvsignore
index a9eba4f1..a9f1d6d0 100644
--- a/plugins/.cvsignore
+++ b/plugins/.cvsignore
@@ -1,3 +1,6 @@
 resistance.la
 .libs
 resistance.lo
+Makefile.in
+.deps
+resistance_la-resistance.lo
diff --git a/plugins/Makefile b/plugins/Makefile
deleted file mode 100644
index 56263a4a..00000000
--- a/plugins/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all clean distclean install uninstall:
-	$(MAKE) -$(MAKEFLAGS) -C .. $@
-
-.PHONY: all clean distclean install uninstall
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
new file mode 100644
index 00000000..2ef58f15
--- /dev/null
+++ b/plugins/Makefile.am
@@ -0,0 +1,21 @@
+plugindir=$(libdir)/openbox/plugins
+
+SUBDIRS = keyboard mouse placement
+
+CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \
+-DPLUGINDIR=\"$(plugindir)\"
+
+INCLUDES=-I..
+
+plugin_LTLIBRARIES=resistance.la
+
+resistance_la_CPPFLAGS=-DG_LOG_DOMAIN=\"Plugin-Resistance\"
+resistance_la_LDFLAGS=-module -avoid-version
+resistance_la_SOURCES=resistance.c
+
+noinst_HEADERS=
+
+MAINTAINERCLEANFILES= Makefile.in
+
+distclean-local:
+	$(RM) *\~ *.orig *.rej .\#*
diff --git a/plugins/keyboard/.cvsignore b/plugins/keyboard/.cvsignore
index 7c81a799..15d08bb6 100644
--- a/plugins/keyboard/.cvsignore
+++ b/plugins/keyboard/.cvsignore
@@ -5,3 +5,5 @@ translate.lo
 keyaction.lo
 .libs
 keyparse.lo
+Makefile.in
+.deps
diff --git a/plugins/keyboard/Makefile b/plugins/keyboard/Makefile
deleted file mode 100644
index 2ed05a6e..00000000
--- a/plugins/keyboard/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all clean distclean install uninstall:
-	$(MAKE) -$(MAKEFLAGS) -C ../.. $@
-
-.PHONY: all clean distclean install uninstall
diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
new file mode 100644
index 00000000..9e956787
--- /dev/null
+++ b/plugins/keyboard/Makefile.am
@@ -0,0 +1,18 @@
+plugindir=$(libdir)/openbox/plugins
+
+CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \
+         -DG_LOG_DOMAIN=\"Plugin-Keyboard\"
+
+INCLUDES=-I../..
+
+plugin_LTLIBRARIES=keyboard.la
+
+keyboard_la_LDFLAGS=-module -avoid-version
+keyboard_la_SOURCES=keyboard.c keyparse.c translate.c tree.c
+
+noinst_HEADERS=keyboard.h keyparse.h translate.h tree.h
+
+MAINTAINERCLEANFILES=Makefile.in
+
+distclean-local:
+	$(RM) *\~ *.orig *.rej .\#*
diff --git a/plugins/mouse/.cvsignore b/plugins/mouse/.cvsignore
index d1419b78..1ae746bd 100644
--- a/plugins/mouse/.cvsignore
+++ b/plugins/mouse/.cvsignore
@@ -3,3 +3,5 @@ mouse.la
 translate.lo
 mouseparse.lo
 .libs
+Makefile.in
+.deps
diff --git a/plugins/mouse/Makefile b/plugins/mouse/Makefile
deleted file mode 100644
index 2ed05a6e..00000000
--- a/plugins/mouse/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all clean distclean install uninstall:
-	$(MAKE) -$(MAKEFLAGS) -C ../.. $@
-
-.PHONY: all clean distclean install uninstall
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
new file mode 100644
index 00000000..06c3b00d
--- /dev/null
+++ b/plugins/mouse/Makefile.am
@@ -0,0 +1,18 @@
+plugindir=$(libdir)/openbox/plugins
+
+CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \
+         -DG_LOG_DOMAIN=\"Plugin-Mouse\"
+
+INCLUDES=-I../..
+
+plugin_LTLIBRARIES=mouse.la
+
+mouse_la_LDFLAGS=-module -avoid-version
+mouse_la_SOURCES=mouse.c mouseparse.c translate.c
+
+noinst_HEADERS=mouse.h mouseparse.h translate.h
+
+MAINTAINERCLEANFILES=Makefile.in
+
+distclean-local:
+	$(RM) *\~ *.orig *.rej .\#*
diff --git a/plugins/placement/.cvsignore b/plugins/placement/.cvsignore
index 4be40fa9..aeb5750c 100644
--- a/plugins/placement/.cvsignore
+++ b/plugins/placement/.cvsignore
@@ -2,3 +2,5 @@ placement.la
 placement.lo
 history.lo
 .libs
+Makefile.in
+.deps
diff --git a/plugins/placement/Makefile b/plugins/placement/Makefile
deleted file mode 100644
index 2ed05a6e..00000000
--- a/plugins/placement/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all clean distclean install uninstall:
-	$(MAKE) -$(MAKEFLAGS) -C ../.. $@
-
-.PHONY: all clean distclean install uninstall
diff --git a/plugins/placement/Makefile.am b/plugins/placement/Makefile.am
new file mode 100644
index 00000000..096d7600
--- /dev/null
+++ b/plugins/placement/Makefile.am
@@ -0,0 +1,18 @@
+plugindir=$(libdir)/openbox/plugins
+
+CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \
+         -DG_LOG_DOMAIN=\"Plugin-Placement\"
+
+INCLUDES=-I../..
+
+plugin_LTLIBRARIES=placement.la
+
+placement_la_LDFLAGS=-module -avoid-version
+placement_la_SOURCES=history.c placement.c
+
+noinst_HEADERS=history.h
+
+MAINTAINERCLEANFILES=Makefile.in
+
+distclean-local:
+	$(RM) *\~ *.orig *.rej .\#*