X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=0095c1a1f7659ebed507457e389f899043676852;hb=d826a887282ce8102ab6ae24442adbeaccf07dbd;hp=25b067d0264b4a200d7cf325e0d5c8b912ae0a51;hpb=960b409249a0e5b5b2f6b16c82286340946a4e86;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 25b067d0..0095c1a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@ desktopfilesdir = $(datadir)/gnome/wm-properties
 pkgconfigdir    = $(libdir)/pkgconfig
 pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
+userscriptdir   = $(datadir)/openbox
 
 theme = TheBear
 
@@ -25,7 +26,8 @@ lib_LTLIBRARIES = \
 
 bin_PROGRAMS = \
 	openbox/openbox \
-	tools/kdetrayproxy/kdetrayproxy
+	tools/kdetrayproxy/kdetrayproxy \
+	tools/gnome-panel-control/gnome-panel-control
 
 ## render ##
 
@@ -49,7 +51,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 +86,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 +202,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
@@ -238,7 +248,7 @@ dist_om4ob_theme_DATA = \
 	themes/Om4Ob/openbox-3/shade_toggled.xbm \
 	themes/Om4Ob/openbox-3/shade.xbm
 
-thebear_themedir = $(themedir)/openbox-3/TheBear
+thebear_themedir = $(themedir)/TheBear/openbox-3
 dist_thebear_theme_DATA = \
 	themes/TheBear/openbox-3/themerc
 
@@ -263,13 +273,18 @@ dist_rc_DATA = \
 	data/rc.xml \
 	data/menu.xml
 
+dist_userscript_DATA = \
+	tools/themeupdate/themeupdate.py
+
+install-data-hook:
+	chmod +x $(userscriptdir)/themeupdate.py
+
 dist_desktopfiles_DATA = \
 	data/openbox.desktop
 
 dist_noinst_DATA = \
 	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 \