X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=7545278bdeafe99841c6932ab7aa001a10c0a9fb;hb=ed4c6995ca199e5d015f1ca90654b4030c7ea760;hp=32f389c55ad76b7b4c250af01113dd8a3a6f188f;hpb=c1b2fc5324522f74a14a5cfa210c95e1509a6e7f;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 32f389c5..7545278b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,10 +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.
@@ -20,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 ##
 
@@ -33,7 +37,13 @@ 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) \
+	$(X_LIBS)
 render_rendertest_SOURCES = render/test.c
 
 render_libobrender_la_CPPFLAGS = \
@@ -43,11 +53,8 @@ render_libobrender_la_CPPFLAGS = \
 	$(XML_CFLAGS) \
 	-DG_LOG_DOMAIN=\"ObRender\" \
 	-DDEFAULT_THEME=\"$(theme)\"
-render_libobrender_la_LIBADD = \
-	$(X_LIBS) \
-	$(XFT_LIBS) \
-	$(GLIB_LIBS) \
-	parser/libobparser.la
+render_libobrender_la_LDFLAGS = \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 render_libobrender_la_SOURCES = \
 	gettext.h \
 	render/color.h \
@@ -78,9 +85,8 @@ 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 = \
 	parser/parse.h \
 	parser/parse.c
@@ -100,12 +106,14 @@ openbox_openbox_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
 	$(SM_LIBS) \
+	$(XFT_LIBS) \
 	$(XINERAMA_LIBS) \
 	$(XKB_LIBS) \
 	$(XRANDR_LIBS) \
 	$(VIDMODE_LIBS) \
 	$(XSHAPE_LIBS) \
 	$(GLIB_LIBS) \
+	$(X_LIBS) \
 	$(LIBSN_LIBS) \
 	$(XML_LIBS) \
 	$(EFENCE_LIBS) \
@@ -196,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
@@ -232,7 +250,7 @@ dist_om4ob_theme_DATA = \
 	themes/Om4Ob/openbox-3/shade_toggled.xbm \
 	themes/Om4Ob/openbox-3/shade.xbm
 
-thebear_themedir = $(themedir)/TheBear
+thebear_themedir = $(themedir)/TheBear/openbox-3
 dist_thebear_theme_DATA = \
 	themes/TheBear/openbox-3/themerc
 
@@ -244,6 +262,9 @@ pubinclude_HEADERS = \
 	render/theme.h \
 	parser/parse.h
 
+nodist_pubinclude_HEADERS = \
+	version.h
+
 nodist_pkgconfig_DATA = \
 	render/obrender-3.0.pc \
 	parser/obparser-3.0.pc
@@ -253,25 +274,59 @@ 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 = \
+	version.h.in \
+	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 \
 	mkinstalldirs \
+	CHANGELOG \
+	COMPLIANCE \
 	README \
 	COPYING \
 	AUTHORS
 
+CLEANFILES = \
+	data/rc.xml \
+	data/menu.xml
+
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc