move foreign into the Makefile.am

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 194492b43e8e82dd74899136b29fbdf35c906a73..450b85f162aae06adacc489c7d4087e8d38db18d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ userscriptdir   = $(datadir)/openbox
 
 theme = TheBear
 
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = subdir-objects foreign
 ACLOCAL_AMFLAGS = -I m4
 
 INCLUDES = -I.
@@ -22,8 +22,8 @@ noinst_PROGRAMS = \
        render/rendertest
 
 lib_LTLIBRARIES = \
-       render/libobrender.la \
-       parser/libobparser.la
+       parser/libobparser.la \
+       render/libobrender.la
 
 bin_PROGRAMS = \
        openbox/openbox \
@@ -275,18 +275,30 @@ nodist_rc_DATA = \
        data/menu.xml
 
 dist_xsd_DATA = \
-       data/rc.xsd
+       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 $@
+       @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 $@
-       @$(SED) -e 's!@version@!$(VERSION)!' -e 's!@xsddir@!$(xsddir)!' $^ > $@
+       @rm -f $@
+       @mkdir data 2>/dev/null || true
+       @$(edit) $(srcdir)/data/menu.xml.in >$@
 
 dist_userscript_DATA = \
        tools/themeupdate/themeupdate.py
 
 install-data-hook:
-       chmod +x $(userscriptdir)/themeupdate.py
+       chmod +x $(DESTDIR)$(userscriptdir)/themeupdate.py
 
 dist_desktopfiles_DATA = \
        data/openbox.desktop
@@ -304,6 +316,10 @@ EXTRA_DIST = \
        COPYING \
        AUTHORS
 
+CLEANFILES = \
+       data/rc.xml \
+       data/menu.xml
+
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc