3 files changed, 4 insertions, 39 deletions
diff --git a/plugins/keyboard/.cvsignore b/plugins/keyboard/.cvsignore
index ef46dd01..7226a5da 100644
--- a/plugins/keyboard/.cvsignore
+++ b/plugins/keyboard/.cvsignore
@@ -1,14 +1,5 @@
 keyboard.lo
 keyboard.la
-Makefile
-Makefile.in
-.libs
-.deps
 tree.lo
 translate.lo
 keyaction.lo
-lex.kparse.c
-lex.kparse.lo
-y.tab.c
-y.tab.h
-y.tab.lo 
diff --git a/plugins/keyboard/Makefile b/plugins/keyboard/Makefile
new file mode 100644
index 00000000..2ed05a6e
--- /dev/null
+++ b/plugins/keyboard/Makefile
@@ -0,0 +1,4 @@
+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
deleted file mode 100644
index 1b6800ce..00000000
--- a/plugins/keyboard/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-plugindir=$(libdir)/openbox/plugins
-rcdir=$(datadir)/openbox
-
-CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) @CPPFLAGS@ \
--DPLUGINDIR=\"$(plugindir)\" \
--DRCDIR=\"$(rcdir)\" \
--DG_LOG_DOMAIN=\"Plugin-Keyboard\"
-
-plugin_LTLIBRARIES=keyboard.la
-
-keyboard_la_LDFLAGS=-module -avoid-version
-keyboard_la_SOURCES=keyboard.c tree.c translate.c y.tab.c lex.kparse.c
-
-lex.kparse.c: keysrc.l y.tab.c
-	$(FLEX) -Pkparse $<
-
-y.tab.c: keysrc.yacc
-	$(YACC) -d -p kparse $<
-
-rc_DATA=keysrc
-
-noinst_HEADERS=keyboard.h tree.h translate.h keysrc.h
-
-MAINTAINERCLEANFILES= Makefile.in
-
-clean-local:
-	$(RM) y.tab.c lex.kparse.c
-
-distclean-local:
-	$(RM) *\~ *.orig *.rej .\#*