X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=98e436a9cf191c8a18678ae900f53f2aab1fb914;hb=064e997145a5f1fd441edeafcc12964f8c584361;hp=edfb202bca1dab02d93881e88aa3e88b4dce4e69;hpb=7fbf1f4bd82d4b7dd738bd04fa7677494d645875;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index edfb202b..98e436a9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,54 +1,67 @@
 SUBDIRS = m4 po
 
-themedir        = $(datadir)/openbox/themes
+themedir        = $(datadir)/themes
 localedir       = $(datadir)/locale
-rcdir           = $(datadir)/openbox
+configdir       = $(sysconfdir)/xdg
+rcdir           = $(configdir)/openbox
 desktopfilesdir = $(datadir)/gnome/wm-properties
+pkgconfigdir    = $(libdir)/pkgconfig
+pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
+xsddir          = $(datadir)/openbox
 
-theme = thebear
+theme = Clearlooks
+
+AUTOMAKE_OPTIONS = subdir-objects foreign
 
-AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS = -I m4
 
 INCLUDES = -I.
 
-noinst_PROGRAMS = \
+check_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/gnome-panel-control/gnome-panel-control
 
-if OBCONF
-bin_PROGRAMS += \
-	tools/obconf/obconf
-endif
+noinst_PROGRAMS = \
+	tools/themetoxml/themetoxml
 
 ## render ##
 
 render_rendertest_CPPFLAGS = \
-	$(XFT_CFLAGS) \
+	$(PANGO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\"RenderTest\"
-render_rendertest_LDADD = render/libobrender.la
+render_rendertest_LDADD = \
+	parser/libobparser.la \
+	render/libobrender.la \
+	$(GLIB_LIBS) \
+	$(PANGO_LIBS) \
+	$(XML_LIBS) \
+	$(X_LIBS)
 render_rendertest_SOURCES = render/test.c
 
 render_libobrender_la_CPPFLAGS = \
 	$(X_CFLAGS) \
-	$(XFT_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(XML_CFLAGS) \
+	$(PANGO_CFLAGS) \
 	-DG_LOG_DOMAIN=\"ObRender\" \
-	-DDEFAULT_THEME=\"$(theme)\" \
-	-DTHEMEDIR=\"$(themedir)\"
+	-DDEFAULT_THEME=\"$(theme)\"
+render_libobrender_la_LDFLAGS = \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 render_libobrender_la_LIBADD = \
+	parser/libobparser.la \
 	$(X_LIBS) \
-	$(XFT_LIBS) \
-	$(GLIB_LIBS)
+	$(PANGO_LIBS) \
+	$(GLIB_LIBS) \
+	$(XML_LIBS)
 render_libobrender_la_SOURCES = \
 	gettext.h \
 	render/color.h \
@@ -58,6 +71,7 @@ render_libobrender_la_SOURCES = \
 	render/geom.h \
 	render/gradient.h \
 	render/gradient.c \
+	render/icon.h \
 	render/image.h \
 	render/image.c \
 	render/instance.h \
@@ -76,10 +90,13 @@ parser_libobparser_la_CPPFLAGS = \
 	$(XML_CFLAGS) \
 	-DG_LOG_DOMAIN=\"ObParser\" \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-DRCDIR=\"$(rcdir)\"
+	-DDATADIR=\"$(datadir)\" \
+	-DCONFIGDIR=\"$(configdir)\"
+parser_libobparser_la_LDFLAGS = \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 parser_libobparser_la_LIBADD = \
 	$(GLIB_LIBS) \
-	$(XML_LIBS)
+	$(XML_LIBS) 
 parser_libobparser_la_SOURCES = \
 	parser/parse.h \
 	parser/parse.c
@@ -87,23 +104,33 @@ parser_libobparser_la_SOURCES = \
 ## openbox ##
 
 openbox_openbox_CPPFLAGS = \
+	$(SM_CFLAGS) \
+	$(XINERAMA_CFLAGS) \
+	$(XKB_CFLAGS) \
+	$(XRANDR_CFLAGS) \
+	$(XSHAPE_CFLAGS) \
+	$(XSYNC_CFLAGS) \
 	$(X_CFLAGS) \
+	$(XCURSOR_CFLAGS) \
 	$(SM_CFLAGS) \
-	$(XFT_CFLAGS) \
+	$(PANGO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(LIBSN_CFLAGS) \
 	$(XML_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-DRCDIR=\"$(rcdir)\" \
+	-DDATADIR=\"$(datadir)\" \
+	-DCONFIGDIR=\"$(configdir)\" \
 	-DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
 	$(SM_LIBS) \
 	$(XINERAMA_LIBS) \
 	$(XKB_LIBS) \
 	$(XRANDR_LIBS) \
-	$(VIDMODE_LIBS) \
 	$(XSHAPE_LIBS) \
+	$(XSYNC_LIBS) \
 	$(GLIB_LIBS) \
+	$(X_LIBS) \
+	$(XCURSOR_LIBS) \
 	$(LIBSN_LIBS) \
 	$(XML_LIBS) \
 	$(EFENCE_LIBS) \
@@ -119,6 +146,8 @@ openbox_openbox_SOURCES = \
 	openbox/client.h \
 	openbox/client_list_menu.c \
 	openbox/client_list_menu.h \
+	openbox/client_list_combined_menu.c \
+	openbox/client_list_combined_menu.h \
 	openbox/client_menu.c \
 	openbox/client_menu.h \
 	openbox/config.c \
@@ -146,6 +175,8 @@ openbox_openbox_SOURCES = \
 	openbox/keyboard.h \
 	openbox/keytree.c \
 	openbox/keytree.h \
+	openbox/mainloop.c \
+	openbox/mainloop.h \
 	openbox/menuframe.c \
 	openbox/menuframe.h \
 	openbox/menu.c \
@@ -172,10 +203,8 @@ openbox_openbox_SOURCES = \
 	openbox/session.h \
 	openbox/stacking.c \
 	openbox/stacking.h \
-	openbox/startup.c \
-	openbox/startup.h \
-	openbox/timer.c \
-	openbox/timer.h \
+	openbox/startupnotify.c \
+	openbox/startupnotify.h \
 	openbox/translate.c \
 	openbox/translate.h \
 	openbox/window.c \
@@ -183,132 +212,219 @@ openbox_openbox_SOURCES = \
 	openbox/xerror.c \
 	openbox/xerror.h
 
-## obconf ##
 
-tools_obconf_obconf_CPPFLAGS = \
-	$(GTK_CFLAGS) \
-	$(GDK_PIXBUF_CFLAGS) \
-	$(XML_CFLAGS) \
-	-DLOCALEDIR=\"$(localedir)\" \
-	-DPLUGINDIR=\"$(plugindir)\" \
-	-DRCDIR=\"$(rcdir)\" \
-	-DPIXMAPDIR=\"$(pixmapdir)\" \
-	-DG_LOG_DOMAIN=\"Obconf\"
-tools_obconf_obconf_LDADD = \
-	$(GTK_LIBS) \
-	$(GDK_PIXBUF_LIBS) \
-	$(LIBINTL) \
-	render/libobrender.la \
-	parser/libobparser.la
-tools_obconf_obconf_SOURCES = \
-	gettext.h \
-	tools/obconf/main.c \
-	plugins/obconf_interface.h
+## themetoxml ##
+
+tools_themetoxml_themetoxml_CPPFLAGS = \
+	$(X_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(XML_CFLAGS)
+tools_themetoxml_themetoxml_LDADD = \
+	$(X_LIBS) \
+	$(GLIB_LIBS) \
+	$(XML_LIBS)
+tools_themetoxml_themetoxml_SOURCES = \
+	tools/themetoxml/themetoxml.c \
+	tools/themetoxml/rgb.h
 
 
-## kdetrayproxy ##
+## gnome-panel-control ##
 
-tools_kdetrayproxy_kdetrayproxy_CPPFLAGS = \
+tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \
 	$(X_CFLAGS)
-tools_kdetrayproxy_kdetrayproxy_LDADD = \
+tools_gnome_panel_control_gnome_panel_control_LDADD = \
 	$(X_LIBS)
-tools_kdetrayproxy_kdetrayproxy_SOURCES = \
-	tools/kdetrayproxy/kdetrayproxy.c
+tools_gnome_panel_control_gnome_panel_control_SOURCES = \
+	tools/gnome-panel-control/gnome-panel-control.c
 
 
 ## themes ##
 
-thebear_themedir = $(themedir)/thebear
-dist_thebear_theme_DATA = \
-	themes/thebear/themerc
-
-planton_themedir = $(themedir)/planton
-dist_planton_theme_DATA = \
-	themes/planton/themerc \
-	themes/planton/max.xbm \
-	themes/planton/max_toggled.xbm \
-	themes/planton/desk.xbm \
-	themes/planton/desk_toggled.xbm \
-	themes/planton/shade.xbm \
-	themes/planton/shade_toggled.xbm \
-	themes/planton/iconify.xbm \
-	themes/planton/close.xbm
-
-lightindustry_themedir = $(themedir)/Light-Industry
-dist_lightindustry_theme_DATA = \
-	themes/Light-Industry/themerc \
-	themes/Light-Industry/max.xbm \
-	themes/Light-Industry/iconify.xbm \
-	themes/Light-Industry/close.xbm
-
-lightindustrybig_themedir = $(themedir)/Light-Industry-big
-dist_lightindustrybig_theme_DATA = \
-	themes/Light-Industry-big/themerc \
-	themes/Light-Industry-big/max.xbm \
-	themes/Light-Industry-big/iconify.xbm \
-	themes/Light-Industry-big/close.xbm
-
-imerry_themedir = $(themedir)/I-merry
-dist_imerry_theme_DATA = \
-	themes/I-merry/themerc \
-	themes/I-merry/max.xbm \
-	themes/I-merry/iconify.xbm \
-	themes/I-merry/close.xbm
-
-greenz_themedir = $(themedir)/greenz
-dist_greenz_theme_DATA = \
-	themes/greenz/themerc
-
-bbstyle_themedir = $(themedir)/BBstylE
-dist_bbstyle_theme_DATA = \
-	themes/BBstylE/themerc \
-	themes/BBstylE/max.xbm \
-	themes/BBstylE/max_toggled.xbm \
-	themes/BBstylE/desk.xbm \
-	themes/BBstylE/desk_toggled.xbm \
-	themes/BBstylE/shade.xbm \
-	themes/BBstylE/shade_toggled.xbm \
-	themes/BBstylE/iconify.xbm \
-	themes/BBstylE/close.xbm
-
-om4ob_themedir = $(themedir)/om4ob
-dist_om4ob_theme_DATA = \
-	themes/om4ob/themerc \
-	themes/om4ob/close_hover.xbm \
-	themes/om4ob/close.xbm \
-	themes/om4ob/desk_hover.xbm \
-	themes/om4ob/desk_toggled.xbm \
-	themes/om4ob/desk.xbm \
-	themes/om4ob/iconify_hover.xbm \
-	themes/om4ob/iconify_pressed.xbm \
-	themes/om4ob/iconify.xbm \
-	themes/om4ob/max_disabled.xbm \
-	themes/om4ob/max_hover.xbm \
-	themes/om4ob/max_pressed.xbm \
-	themes/om4ob/max_toggled.xbm \
-	themes/om4ob/max.xbm \
-	themes/om4ob/shade_disabled.xbm \
-	themes/om4ob/shade_hover.xbm \
-	themes/om4ob/shade_toggled.xbm \
-	themes/om4ob/shade.xbm
+clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
+dist_clearlooks_theme_DATA= \
+	themes/Clearlooks/openbox-3/bullet.xbm \
+	themes/Clearlooks/openbox-3/close.xbm \
+	themes/Clearlooks/openbox-3/desk_toggled.xbm \
+	themes/Clearlooks/openbox-3/desk.xbm \
+	themes/Clearlooks/openbox-3/iconify.xbm \
+	themes/Clearlooks/openbox-3/max_toggled.xbm \
+	themes/Clearlooks/openbox-3/max.xbm \
+	themes/Clearlooks/openbox-3/themerc.xml
+
+clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
+dist_clearlooksolive_theme_DATA= \
+	themes/Clearlooks-Olive/openbox-3/bullet.xbm \
+	themes/Clearlooks-Olive/openbox-3/close.xbm \
+	themes/Clearlooks-Olive/openbox-3/desk_toggled.xbm \
+	themes/Clearlooks-Olive/openbox-3/desk.xbm \
+	themes/Clearlooks-Olive/openbox-3/iconify.xbm \
+	themes/Clearlooks-Olive/openbox-3/max_toggled.xbm \
+	themes/Clearlooks-Olive/openbox-3/max.xbm \
+	themes/Clearlooks-Olive/openbox-3/themerc.xml
+
+mikachu_themedir = $(themedir)/Mikachu/openbox-3
+dist_mikachu_theme_DATA= \
+	themes/Mikachu/openbox-3/bullet.xbm \
+	themes/Mikachu/openbox-3/close.xbm \
+	themes/Mikachu/openbox-3/desk.xbm \
+	themes/Mikachu/openbox-3/iconify.xbm \
+	themes/Mikachu/openbox-3/max.xbm \
+	themes/Mikachu/openbox-3/themerc.xml
+
+
+natura_themedir = $(themedir)/Natura/openbox-3
+dist_natura_theme_DATA= \
+	themes/Natura/openbox-3/close_hover.xbm \
+	themes/Natura/openbox-3/close.xbm \
+	themes/Natura/openbox-3/desk_toggled.xbm \
+	themes/Natura/openbox-3/desk.xbm \
+	themes/Natura/openbox-3/iconify_disabled.xbm \
+	themes/Natura/openbox-3/iconify_hover.xbm \
+	themes/Natura/openbox-3/iconify.xbm \
+	themes/Natura/openbox-3/max_disabled.xbm \
+	themes/Natura/openbox-3/max_hover.xbm \
+	themes/Natura/openbox-3/max_toggled.xbm \
+	themes/Natura/openbox-3/max.xbm \
+	themes/Natura/openbox-3/shade.xbm \
+	themes/Natura/openbox-3/themerc.xml
+
+artwizboxed_themedir = $(themedir)/artwiz-boxed/openbox-3
+dist_artwizboxed_theme_DATA= \
+	themes/artwiz-boxed/openbox-3/bullet.xbm \
+	themes/artwiz-boxed/openbox-3/close.xbm \
+	themes/artwiz-boxed/openbox-3/desk_toggled.xbm \
+	themes/artwiz-boxed/openbox-3/desk.xbm \
+	themes/artwiz-boxed/openbox-3/iconify.xbm \
+	themes/artwiz-boxed/openbox-3/max_toggled.xbm \
+	themes/artwiz-boxed/openbox-3/max.xbm \
+	themes/artwiz-boxed/openbox-3/themerc.xml
+
+bear2_themedir = $(themedir)/bear2/openbox-3
+dist_bear2_theme_DATA= \
+	themes/bear2/openbox-3/close_pressed.xbm \
+	themes/bear2/openbox-3/close.xbm \
+	themes/bear2/openbox-3/desk_toggled.xbm \
+	themes/bear2/openbox-3/desk.xbm \
+	themes/bear2/openbox-3/iconify_disabled.xbm \
+	themes/bear2/openbox-3/iconify_pressed.xbm \
+	themes/bear2/openbox-3/iconify.xbm \
+	themes/bear2/openbox-3/max_disabled.xbm \
+	themes/bear2/openbox-3/max_pressed.xbm \
+	themes/bear2/openbox-3/max_toggled.xbm \
+	themes/bear2/openbox-3/max.xbm \
+	themes/bear2/openbox-3/shade_pressed.xbm \
+	themes/bear2/openbox-3/shade.xbm \
+	themes/bear2/openbox-3/themerc.xml
+
+orang_themedir = $(themedir)/orang/openbox-3
+dist_orang_theme_DATA= \
+	themes/orang/openbox-3/themerc.xml
+
+syscrash_themedir = $(themedir)/syscrash/openbox-3
+dist_syscrash_theme_DATA= \
+	themes/syscrash/openbox-3/bullet.xbm \
+	themes/syscrash/openbox-3/close_disabled.xbm \
+	themes/syscrash/openbox-3/close.xbm \
+	themes/syscrash/openbox-3/desk_toggled.xbm \
+	themes/syscrash/openbox-3/desk.xbm \
+	themes/syscrash/openbox-3/iconify.xbm \
+	themes/syscrash/openbox-3/max_disabled.xbm \
+	themes/syscrash/openbox-3/max_pressed.xbm \
+	themes/syscrash/openbox-3/max_toggled.xbm \
+	themes/syscrash/openbox-3/max.xbm \
+	themes/syscrash/openbox-3/shade.xbm \
+	themes/syscrash/openbox-3/themerc.xml
+
+## public headers ##
+
+pubinclude_HEADERS = \
+	render/color.h \
+	render/font.h \
+	render/geom.h \
+	render/gradient.h \
+	render/image.h \
+	render/instance.h \
+	render/mask.h \
+	render/render.h \
+	render/theme.h \
+	parser/parse.h
+
+nodist_pubinclude_HEADERS = \
+	version.h
 
+nodist_pkgconfig_DATA = \
+	render/obrender-3.0.pc \
+	parser/obparser-3.0.pc
 
 ## data ##
 
-dist_rc_DATA = \
-	data/rc3 \
-	data/menu
+dist_pixmap_DATA = \
+	data/openbox.png
+
+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_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 \
+	tests/hideshow.py \
+	tests/Makefile \
+	tests/aspect.c \
+	tests/fullscreen.c \
+	tests/grav.c \
+	tests/grouptran.c \
+	tests/icons.c \
+	tests/modal2.c \
+	tests/modal3.c \
+	tests/modal.c \
+	tests/noresize.c \
+	tests/override.c \
+	tests/positioned.c \
+	tests/strut.c \
+	tests/title.c \
+	tests/urgent.c
+
 EXTRA_DIST = \
 	config.rpath \
 	mkinstalldirs \
+	CHANGELOG \
+	COMPLIANCE \
 	README \
 	COPYING \
 	AUTHORS
 
+CLEANFILES = \
+	data/rc.xml \
+	data/menu.xml
+
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc