X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=ef0f66c29ab7cf874f002946bbfef993d58df8b0;hb=4cf0d783f741cd1462f36bd03ef7fa9908975d3d;hp=0d688f1ab8c3ff5b1f857d4fe98c03d62c36ec47;hpb=556a08cec8ac15bf2d5e0fa8bcff753e3c3ae145;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 0d688f1a..ef0f66c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,8 @@ userscriptdir   = $(datadir)/openbox
 
 theme = TheBear
 
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = subdir-objects foreign
+
 ACLOCAL_AMFLAGS = -I m4
 
 INCLUDES = -I.
@@ -22,8 +23,8 @@ noinst_PROGRAMS = \
 	render/rendertest
 
 lib_LTLIBRARIES = \
-	render/libobrender.la \
-	parser/libobparser.la
+	parser/libobparser.la \
+	render/libobrender.la
 
 bin_PROGRAMS = \
 	openbox/openbox \
@@ -278,9 +279,21 @@ dist_xsd_DATA = \
 	data/rc.xsd \
 	data/menu.xsd
 
-%.xml: %.xml.in
+edit = $(SED) \
+	-e 's!@version\@!$(VERSION)!' \
+	-e 's!@xsddir\@!$(xsddir)!'
+
+data/rc.xml: Makefile $(srcdir)/data/rc.xml.in data
 	@echo make: creating $@
-	@$(SED) -e 's!@version@!$(VERSION)!' -e 's!@xsddir@!$(xsddir)!' $^ > $@
+	@rm -f $@
+	@mkdir data 2>/dev/null || true
+	@$(edit) $(srcdir)/data/rc.xml.in >$@
+
+data/menu.xml: Makefile $(srcdir)/data/menu.xml.in data
+	@echo make: creating $@
+	@rm -f $@
+	@mkdir data 2>/dev/null || true
+	@$(edit) $(srcdir)/data/menu.xml.in >$@
 
 dist_userscript_DATA = \
 	tools/themeupdate/themeupdate.py
@@ -304,6 +317,10 @@ EXTRA_DIST = \
 	COPYING \
 	AUTHORS
 
+CLEANFILES = \
+	data/rc.xml \
+	data/menu.xml
+
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc