From 2f9efb384d7afd456c44dd1b0c4619adbae5b248 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Sun, 29 Jun 2003 08:47:24 +0000
Subject: [PATCH] prepare for alpha1 release. make 'make dist' work.

---
 Makefile.am                     | 10 ++--
 configure.ac                    | 15 +++---
 data/Makefile.am                |  2 +
 openbox/Makefile.am             | 83 +++++++++++++++++++++++++--------
 parser/Makefile.am              | 12 ++---
 plugins/Makefile.am             |  2 +-
 plugins/keyboard/Makefile.am    | 16 ++++---
 plugins/menu/Makefile.am        | 11 ++---
 plugins/mouse/Makefile.am       | 12 +++--
 plugins/placement/Makefile.am   | 10 ++--
 plugins/resistance/Makefile.am  | 17 +++----
 render/Makefile.am              |  9 ++--
 themes/Makefile.am              |  2 +
 themes/ebox_data/Makefile.am    |  7 +++
 themes/fieron2_data/Makefile.am |  7 +++
 themes/fieron_data/Makefile.am  |  7 +++
 tools/obconf/Makefile.am        | 20 ++++----
 17 files changed, 158 insertions(+), 84 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 433af840..172b3b12 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = po themes data render parser kernel plugins tools
+SUBDIRS = m4 po themes data render parser kernel plugins tools
 MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
 
 doc:
@@ -9,7 +9,11 @@ distclean-local:
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = config.rpath mkinstalldirs INSTALL README \
-             COPYING AUTHORS CHANGELOG
+EXTRA_DIST = \
+  config.rpath \
+  mkinstalldirs \
+  README \
+  COPYING \
+  AUTHORS
 
 .PHONY: doc
diff --git a/configure.ac b/configure.ac
index 8f4a68ea..e33f375d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.54])
-AC_INIT([openbox], [2.90.0cvs], [http://bugzilla.icculus.org])
+AC_INIT([openbox], [3.0-alpha1], [http://bugzilla.icculus.org])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([kernel/openbox.c])
 
@@ -16,14 +16,6 @@ OB_COMPILER_FLAGS
 AC_C_CONST
 AC_C_INLINE
 
-if test "$CVS" = "yes"; then
-    AC_PATH_PROG([FLEX], [flex])
-    test "$FLEX" || AC_MSG_ERROR([flex not found])
-
-    AC_PATH_PROG([BISON], [bison])
-    test "BISON" || AC_MSG_ERROR([bison not found])
-fi
-
 AC_DISABLE_STATIC
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
@@ -96,6 +88,10 @@ AM_CONDITIONAL(OBCONF, [test "$use_gtk" = "yes" && test "$use_glade" = "yes"])
 # Check for session management
 X11_SM
 
+#EFENCE_LIBS=-lefence
+EFENCE_LIBS=""
+AC_SUBST(EFENCE_LIBS)
+
 # Check for X11 extensions
 X11_EXT_XKB
 X11_EXT_XRANDR
@@ -104,6 +100,7 @@ X11_EXT_SHAPE
 X11_EXT_XINERAMA
 
 AC_CONFIG_FILES([Makefile
+                 m4/Makefile
                  po/Makefile.in
                  themes/Makefile
                  themes/ebox_data/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index a16d18c9..99d47b3a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,6 +2,8 @@ rcdir=$(datadir)/openbox
 
 rc_DATA=rc3
 
+EXTRA_DIST=$(rc_DATA)
+
 MAINTAINERCLEANFILES=Makefile.in
 
 distclean-local:
diff --git a/openbox/Makefile.am b/openbox/Makefile.am
index adc06bf8..8e5144ab 100644
--- a/openbox/Makefile.am
+++ b/openbox/Makefile.am
@@ -6,38 +6,81 @@ desktopfilesdir=$(datadir)/gnome/wm-properties
 binary=openbox
 url=http://openbox.org/
 
-CPPFLAGS=$(X_CFLAGS) $(SM_CFLAGS) $(XFT_CFLAGS) $(GLIB_CFLAGS) \
-         $(GMODULE_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) $(XML_CFLAGS) \
-         @CPPFLAGS@ \
-         -DLOCALEDIR=\"$(localedir)\" \
-         -DPLUGINDIR=\"$(plugindir)\" \
-         -DRCDIR=\"$(rcdir)\" \
-         -DG_LOG_DOMAIN=\"Openbox\" \
-         -DBINARY=\"$(binary)\"
+AM_CPPFLAGS=$(X_CFLAGS) $(SM_CFLAGS) $(XFT_CFLAGS) $(GLIB_CFLAGS) \
+            $(GMODULE_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) $(XML_CFLAGS) \
+            -DLOCALEDIR=\"$(localedir)\" \
+            -DPLUGINDIR=\"$(plugindir)\" \
+            -DRCDIR=\"$(rcdir)\" \
+            -DG_LOG_DOMAIN=\"Openbox\" \
+            -DBINARY=\"$(binary)\"
 
 INCLUDES=-I..
 LIBS=$(X_LIBS) $(SM_LIBS) $(XFT_LIBS) $(XINERAMA_LIBS) $(XKB_LIBS) \
 	$(XRANDR_LIBS) $(VIDMODE_LIBS) $(XSHAPE_LIBS) $(GLIB_LIBS) \
-	$(GMODULE_LIBS) $(LIBSN_LIBS) $(XML_LIBS) @LIBS@ @LIBINTL@
+	$(GMODULE_LIBS) $(LIBSN_LIBS) $(XML_LIBS) $(EFENCE_LIBS) \
+	@LIBS@ @LIBINTL@
 
 bin_PROGRAMS=$(binary)
 
 openbox_LDADD=-lobrender -L../render -lobparser -L../parser
 openbox_LDFLAGS=-export-dynamic
-openbox_SOURCES=action.c client.c config.c \
-                extensions.c focus.c frame.c grab.c menu.c menu_render.c \
-                openbox.c framerender.c plugin.c prop.c screen.c \
-                stacking.c dispatch.c event.c group.c timer.c xerror.c \
-                moveresize.c startup.c popup.c dock.c window.c
-
-noinst_HEADERS=action.h client.h config.h dispatch.h event.h extensions.h \
-               focus.h frame.h framerender.h geom.h gettext.h grab.h group.h \
-               menu.h openbox.h plugin.h prop.h screen.h \
-               stacking.h timer.h xerror.h moveresize.h startup.h popup.h \
-               dock.h window.h
+openbox_SOURCES=\
+  action.h \
+  action.c \
+  client.h \
+  client.c \
+  config.h \
+  config.c \
+  extensions.h \
+  extensions.c \
+  focus.h \
+  focus.c \
+  frame.h \
+  frame.c \
+  grab.h \
+  grab.c \
+  menu.h \
+  menu.c \
+  menu_render.c \
+  openbox.h \
+  openbox.c \
+  framerender.h \
+  framerender.c \
+  plugin.h \
+  plugin.c \
+  prop.h \
+  prop.c \
+  screen.h \
+  screen.c \
+  stacking.h \
+  stacking.c \
+  dispatch.h \
+  dispatch.c \
+  event.h \
+  event.c \
+  group.h \
+  group.c \
+  timer.h \
+  timer.c \
+  xerror.h \
+  xerror.c \
+  moveresize.h \
+  moveresize.c \
+  startup.h \
+  startup.c \
+  popup.h \
+  popup.c \
+  dock.h \
+  dock.c \
+  window.h \
+  window.c \
+  gettext.h \
+  geom.h
 
 desktopfiles_DATA=openbox.desktop
 
+EXTRA_DIST=$(desktopfiles_DATA)
+
 MAINTAINERCLEANFILES=Makefile.in
 
 distclean-local:
diff --git a/parser/Makefile.am b/parser/Makefile.am
index fe80db16..3a6b81c2 100644
--- a/parser/Makefile.am
+++ b/parser/Makefile.am
@@ -1,18 +1,16 @@
 localedir=$(datadir)/locale
 rcdir=$(datadir)/openbox
 
-CPPFLAGS=$(GLIB_CFLAGS) $(XML_CFLAGS) @CPPFLAGS@ \
-         -DG_LOG_DOMAIN=\"Parser\" \
-         -DLOCALEDIR=\"$(localedir)\" \
-         -DRCDIR=\"$(rcdir)\"
+AM_CPPFLAGS=$(GLIB_CFLAGS) $(XML_CFLAGS) \
+            -DG_LOG_DOMAIN=\"Parser\" \
+            -DLOCALEDIR=\"$(localedir)\" \
+            -DRCDIR=\"$(rcdir)\"
 
 INCLUDES=-I..
 LIBS=$(GLIB_LIBS) $(XML_LIBS) @LIBS@
 
 lib_LTLIBRARIES=libobparser.la
-libobparser_la_SOURCES=parse.c
-
-noinst_HEADERS=parse.h
+libobparser_la_SOURCES=parse.c parse.h
 
 MAINTAINERCLEANFILES=Makefile.in
 
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:
diff --git a/render/Makefile.am b/render/Makefile.am
index 87431ae1..49e9b4f9 100644
--- a/render/Makefile.am
+++ b/render/Makefile.am
@@ -2,10 +2,10 @@ themedir=$(datadir)/openbox/themes
 
 theme=operation
 
-CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) @CPPFLAGS@ \
-         -DG_LOG_DOMAIN=\"Render\" \
-         -DDEFAULT_THEME=\"$(theme)\" \
-         -DTHEMEDIR=\"$(themedir)\"
+AM_CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) \
+            -DG_LOG_DOMAIN=\"Render\" \
+            -DDEFAULT_THEME=\"$(theme)\" \
+            -DTHEMEDIR=\"$(themedir)\"
 
 INCLUDES=-I..
 LIBS=$(XFT_LIBS) $(GLIB_LIBS) $(GL_LIBS) @LIBS@
@@ -28,6 +28,7 @@ libobrender_la_SOURCES=\
   mask.c \
   render.h \
   render.c \
+  theme.h \
   theme.c \
   instance.h \
   instance.c
diff --git a/themes/Makefile.am b/themes/Makefile.am
index 9bcd07c9..381b9d1b 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -7,6 +7,8 @@ theme_DATA=artwiz bbs bluebox cthulhain deep ebox fieron fieron2 flux frobozz \
            purplehaaze shade steelblue steelblue2 the_orange trisb twice \
            warp-xp
 
+EXTRA_DIST=$(theme_DATA)
+
 MAINTAINERCLEANFILES=Makefile.in
 
 distclean-local:
diff --git a/themes/ebox_data/Makefile.am b/themes/ebox_data/Makefile.am
index a200ef78..a03f8153 100644
--- a/themes/ebox_data/Makefile.am
+++ b/themes/ebox_data/Makefile.am
@@ -4,3 +4,10 @@ themedata_DATA=\
   close.xbm \
   iconify.xbm \
   max.xbm
+
+EXTRA_DIST=$(themedata_DATA)
+
+MAINTAINERCLEANFILES=Makefile.in
+
+distclean-local:
+	$(RM) *\~ *.orig *.rej .\#*
diff --git a/themes/fieron2_data/Makefile.am b/themes/fieron2_data/Makefile.am
index 0e266c7d..3309af5c 100644
--- a/themes/fieron2_data/Makefile.am
+++ b/themes/fieron2_data/Makefile.am
@@ -5,3 +5,10 @@ themedata_DATA=\
   iconify.xbm \
   max.xbm \
   stick.xbm
+
+EXTRA_DIST=$(themedata_DATA)
+
+MAINTAINERCLEANFILES=Makefile.in
+
+distclean-local:
+	$(RM) *\~ *.orig *.rej .\#*
diff --git a/themes/fieron_data/Makefile.am b/themes/fieron_data/Makefile.am
index 6f2c887f..0f35e1ab 100644
--- a/themes/fieron_data/Makefile.am
+++ b/themes/fieron_data/Makefile.am
@@ -5,3 +5,10 @@ themedata_DATA=\
   iconify.xbm \
   max.xbm \
   stick.xbm
+
+EXTRA_DIST=$(themedata_DATA)
+
+MAINTAINERCLEANFILES=Makefile.in
+
+distclean-local:
+	$(RM) *\~ *.orig *.rej .\#*
diff --git a/tools/obconf/Makefile.am b/tools/obconf/Makefile.am
index a83049f3..fcfadba6 100644
--- a/tools/obconf/Makefile.am
+++ b/tools/obconf/Makefile.am
@@ -2,12 +2,11 @@ localedir=$(datadir)/locale
 plugindir=$(libdir)/openbox/plugins
 rcdir=$(datadir)/openbox
 
-CPPFLAGS=$(GTK_CFLAGS) $(GLADE_CFLAGS) $(GMODULE_CFLAGS) $(XML_CFLAGS) \
-         @CPPFLAGS@ \
-         -DLOCALEDIR=\"$(localedir)\" \
-         -DRCDIR=\"$(rcdir)\" \
-         -DPLUGINDIR=\"$(plugindir)\" \
-         -DG_LOG_DOMAIN=\"ObConf\"
+AM_CPPFLAGS=$(GTK_CFLAGS) $(GLADE_CFLAGS) $(GMODULE_CFLAGS) $(XML_CFLAGS) \
+            -DLOCALEDIR=\"$(localedir)\" \
+            -DRCDIR=\"$(rcdir)\" \
+            -DPLUGINDIR=\"$(plugindir)\" \
+            -DG_LOG_DOMAIN=\"ObConf\"
 
 INCLUDES=-I../..
 LIBS=$(GTK_LIBS) $(GLADE_LIBS) $(GMODULE_LIBS) $(XML_LIBS) @LIBS@ @LIBINTL@
@@ -16,9 +15,12 @@ bin_PROGRAMS=obconf
 
 obconf_LDADD=-lobparser -L../../parser
 obconf_LDFLAGS=-export-dynamic
-obconf_SOURCES=main.c about.c plugins.c
-
-noinst_HEADERS=obconf.h plugins.h
+obconf_SOURCES=\
+  obconf.h \
+  main.c \
+  about.c \
+  plugins.h \
+  plugins.c
 
 MAINTAINERCLEANFILES=Makefile.in