prepare for alpha1 release.

make 'make dist' work.

6 files changed, 36 insertions, 32 deletions

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index ec89616d..3d623b21 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = keyboard mouse placement menu resistance
 
-noinst_HEADERS = interface.h obconf_interface.h
+EXTRA_DIST = interface.h obconf_interface.h
 
 MAINTAINERCLEANFILES= Makefile.in
 
diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
index 4b1e850a..82ed50b4 100644
--- a/plugins/keyboard/Makefile.am
+++ b/plugins/keyboard/Makefile.am
@@ -1,17 +1,21 @@
 plugindir=$(libdir)/openbox/plugins
 
-CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) \
-         $(XML_CFLAGS) @CPPFLAGS@ \
-         -DG_LOG_DOMAIN=\"Plugin-Keyboard\"
+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.c translate.c tree.c
-
-noinst_HEADERS=keyboard.h keyparse.h translate.h tree.h
+keyboard_la_SOURCES=\
+  keyboard.h \
+  keyboard.c \
+  translate.h \
+  translate.c \
+  tree.h \
+  tree.c
 
 MAINTAINERCLEANFILES=Makefile.in
 
diff --git a/plugins/menu/Makefile.am b/plugins/menu/Makefile.am
index 3ed9c5c6..1e757bdb 100644
--- a/plugins/menu/Makefile.am
+++ b/plugins/menu/Makefile.am
@@ -1,24 +1,21 @@
 plugindir=$(libdir)/openbox/plugins
 
-CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(XML_CFLAGS)
-         \@CPPFLAGS@ \
-         -DG_LOG_DOMAIN=\"Plugin-Timed-Menu\"
+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_la_SOURCES=timed_menu.c timed_menu.h
 
 fifo_menu_la_LDFLAGS=-module -avoid-version
-fifo_menu_la_SOURCES=fifo_menu.c
+fifo_menu_la_SOURCES=fifo_menu.c fifo_menu.h
 
 client_menu_la_LDFLAGS=-module -avoid-version
 client_menu_la_SOURCES=client_menu.c
 
-noinst_HEADERS=timed_menu.h fifo_menu.h
-
 MAINTAINERCLEANFILES=Makefile.in
 
 distclean-local:
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
index 3d4d6b9e..5595fe69 100644
--- a/plugins/mouse/Makefile.am
+++ b/plugins/mouse/Makefile.am
@@ -1,15 +1,19 @@
 plugindir=$(libdir)/openbox/plugins
 
-CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) \
-         $(XML_CFLAGS)  @CPPFLAGS@ \
-         -DG_LOG_DOMAIN=\"Plugin-Mouse\"
+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.c translate.c
+mouse_la_SOURCES=\
+  mouse.h \
+  mouse.c \
+  translate.h \
+  translate.c
 
 noinst_HEADERS=mouse.h translate.h
 
diff --git a/plugins/placement/Makefile.am b/plugins/placement/Makefile.am
index 762f5af8..58fa1fa7 100644
--- a/plugins/placement/Makefile.am
+++ b/plugins/placement/Makefile.am
@@ -1,17 +1,15 @@
 plugindir=$(libdir)/openbox/plugins
 
-CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) \
-         $(XML_CFLAGS) @CPPFLAGS@ \
-         -DG_LOG_DOMAIN=\"Plugin-Placement\"
+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 placement.c
-
-noinst_HEADERS=history.h
+placement_la_SOURCES=history.c history.h placement.c
 
 MAINTAINERCLEANFILES=Makefile.in
 
diff --git a/plugins/resistance/Makefile.am b/plugins/resistance/Makefile.am
index 9f95f947..7ef2ea9f 100644
--- a/plugins/resistance/Makefile.am
+++ b/plugins/resistance/Makefile.am
@@ -1,8 +1,8 @@
 plugindir=$(libdir)/openbox/plugins
 
-CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) \
-         $(XML_CFLAGS)  @CPPFLAGS@ \
-         -DPLUGINDIR=\"$(plugindir)\"
+AM_CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) \
+            $(XML_CFLAGS) \
+            -DPLUGINDIR=\"$(plugindir)\"
 
 INCLUDES=-I../.. -I../../tools
 
@@ -11,21 +11,22 @@ if OBCONF
 plugin_LTLIBRARIES+=resistance-config.la
 endif
 
-resistance_la_CPPFLAGS=-DG_LOG_DOMAIN=\"Plugin-Resistance\"
+resistance_la_CPPFLAGS=$(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"Plugin-Resistance\"
 resistance_la_LDFLAGS=-module -avoid-version
-resistance_la_SOURCES=resistance.c
+resistance_la_SOURCES=resistance.c resistance.h
 
 if OBCONF
-resistance_config_la_CPPFLAGS=-DG_LOG_DOMAIN=\"Plugin-Resistance\" \
+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_HEADERS=resistance.h
-
 noinst_DATA=resistance.glade resistance.gladep
 
+EXTRA_DIST=$(noinst_DATA)
+
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local: