X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=ad1c0fcde4044d4a93f1bb5bb6c308e222fc939c;hb=466096a61908361ef8dfb7424bfaef03228a93ce;hp=194492b43e8e82dd74899136b29fbdf35c906a73;hpb=86fa7c096668feee1f629c27552bf5e262e8556f;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 194492b4..ad1c0fcd 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 \
@@ -36,7 +37,12 @@ render_rendertest_CPPFLAGS = \
 	$(XFT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\"RenderTest\"
-render_rendertest_LDADD = render/libobrender.la
+render_rendertest_LDADD = \
+	parser/libobparser.la \
+	render/libobrender.la \
+	$(XFT_LIBS) \
+	$(GLIB_LIBS) \
+	$(XML_LIBS)
 render_rendertest_SOURCES = render/test.c
 
 render_libobrender_la_CPPFLAGS = \
@@ -47,10 +53,7 @@ render_libobrender_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"ObRender\" \
 	-DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LIBADD = \
-	$(X_LIBS) \
-	$(XFT_LIBS) \
-	$(GLIB_LIBS) \
-	parser/libobparser.la
+	$(X_LIBS)
 render_libobrender_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 render_libobrender_la_SOURCES = \
@@ -83,9 +86,6 @@ parser_libobparser_la_CPPFLAGS = \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DCONFIGDIR=\"$(configdir)\"
-parser_libobparser_la_LIBADD = \
-	$(GLIB_LIBS) \
-	$(XML_LIBS)
 parser_libobparser_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 parser_libobparser_la_SOURCES = \
@@ -107,6 +107,7 @@ openbox_openbox_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
 	$(SM_LIBS) \
+	$(XFT_LIBS) \
 	$(XINERAMA_LIBS) \
 	$(XKB_LIBS) \
 	$(XRANDR_LIBS) \
@@ -275,18 +276,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 $@
-	@$(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
 
 install-data-hook:
-	chmod +x $(userscriptdir)/themeupdate.py
+	chmod +x $(DESTDIR)$(userscriptdir)/themeupdate.py
 
 dist_desktopfiles_DATA = \
 	data/openbox.desktop
@@ -304,6 +317,10 @@ EXTRA_DIST = \
 	COPYING \
 	AUTHORS
 
+CLEANFILES = \
+	data/rc.xml \
+	data/menu.xml
+
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc