X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=0d688f1ab8c3ff5b1f857d4fe98c03d62c36ec47;hb=087ea0e5cb678d6a2339992c56f83482273fa7d6;hp=0bc4e495e81f8db716a04208907a32344cf3eaa6;hpb=f7790bb48175fbde12d886abfe383a673571235a;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 0bc4e495..0d688f1a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,8 @@ 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
 
@@ -25,7 +27,8 @@ lib_LTLIBRARIES = \
 
 bin_PROGRAMS = \
 	openbox/openbox \
-	tools/kdetrayproxy/kdetrayproxy
+	tools/kdetrayproxy/kdetrayproxy \
+	tools/gnome-panel-control/gnome-panel-control
 
 ## render ##
 
@@ -49,7 +52,6 @@ render_libobrender_la_LIBADD = \
 	$(GLIB_LIBS) \
 	parser/libobparser.la
 render_libobrender_la_LDFLAGS = \
-	-release $(LT_RELEASE) \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 render_libobrender_la_SOURCES = \
 	gettext.h \
@@ -85,7 +87,6 @@ parser_libobparser_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(XML_LIBS)
 parser_libobparser_la_LDFLAGS = \
-	-release $(LT_RELEASE) \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 parser_libobparser_la_SOURCES = \
 	parser/parse.h \
@@ -202,6 +203,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
@@ -259,17 +270,32 @@ 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
+
+%.xml: %.xml.in
+	@echo make: creating $@
+	@$(SED) -e 's!@version@!$(VERSION)!' -e 's!@xsddir@!$(xsddir)!' $^ > $@
+
+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 \
-	tools/themeupdate/themeupdate.py
+	parser/obparser-3.0.pc.in
 
 EXTRA_DIST = \
 	config.rpath \