X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=ef0f66c29ab7cf874f002946bbfef993d58df8b0;hb=54ccb6a5428fbf33bf1a97d0f60f6623f0195fa3;hp=35b837e516352d6c0bdadda0540a9a67730b8fec;hpb=42bbf21bbd854d0fe2c1b0d0087fd45637a00edb;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 35b837e5..ef0f66c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,11 +8,13 @@ desktopfilesdir = $(datadir)/gnome/wm-properties
 pkgconfigdir    = $(libdir)/pkgconfig
 pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
+xsddir          = $(datadir)/openbox
 userscriptdir   = $(datadir)/openbox
 
 theme = TheBear
 
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = subdir-objects foreign
+
 ACLOCAL_AMFLAGS = -I m4
 
 INCLUDES = -I.
@@ -21,12 +23,13 @@ noinst_PROGRAMS = \
 	render/rendertest
 
 lib_LTLIBRARIES = \
-	render/libobrender.la \
-	parser/libobparser.la
+	parser/libobparser.la \
+	render/libobrender.la
 
 bin_PROGRAMS = \
 	openbox/openbox \
-	tools/kdetrayproxy/kdetrayproxy
+	tools/kdetrayproxy/kdetrayproxy \
+	tools/gnome-panel-control/gnome-panel-control
 
 ## render ##
 
@@ -201,6 +204,16 @@ tools_kdetrayproxy_kdetrayproxy_SOURCES = \
 	tools/kdetrayproxy/kdetrayproxy.c
 
 
+## gnome-panel-control ##
+
+tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \
+	$(X_CFLAGS)
+tools_gnome_panel_control_gnome_panel_control_LDADD = \
+	$(X_LIBS)
+tools_gnome_panel_control_gnome_panel_control_SOURCES = \
+	tools/gnome-panel-control/gnome-panel-control.c
+
+
 ## themes ##
 
 allegro_themedir = $(themedir)/Allegro/openbox-3
@@ -258,17 +271,42 @@ nodist_pkgconfig_DATA = \
 dist_pixmap_DATA = \
 	data/openbox.png
 
-dist_rc_DATA = \
+nodist_rc_DATA = \
 	data/rc.xml \
 	data/menu.xml
 
+dist_xsd_DATA = \
+	data/rc.xsd \
+	data/menu.xsd
+
+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 $@
+	@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 $(DESTDIR)$(userscriptdir)/themeupdate.py
+
 dist_desktopfiles_DATA = \
 	data/openbox.desktop
 
 dist_noinst_DATA = \
+	data/rc.xml.in \
+	data/menu.xml.in \
 	render/obrender-3.0.pc.in \
 	parser/obparser-3.0.pc.in
 
@@ -279,6 +317,10 @@ EXTRA_DIST = \
 	COPYING \
 	AUTHORS
 
+CLEANFILES = \
+	data/rc.xml \
+	data/menu.xml
+
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc