X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=8fad996c1946b2bff8e68d84a41a9e33527d2920;hb=48c3bc7cf8baa5df18d7f3ac6dddc50eaa27ee92;hp=96f3cb19362956ec80b6019f6843947fa441408c;hpb=d618c3bc9911ece882761f196ed1685caa200271;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 96f3cb19..8fad996c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,54 +1,78 @@
 SUBDIRS = m4 po
 
-themedir        = $(datadir)/openbox/themes
+docxbmdir       = $(docdir)/xbm
+themedir        = $(datadir)/themes
 localedir       = $(datadir)/locale
-rcdir           = $(datadir)/openbox
-desktopfilesdir = $(datadir)/gnome/wm-properties
+configdir       = $(sysconfdir)/xdg
+rcdir           = $(configdir)/openbox
+xsessionsdir    = $(datadir)/xsessions
+gnomewmfilesdir = $(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
+nodist_bin_SCRIPTS = \
+	data/xsession/openbox-session \
+	data/xsession/openbox-gnome-session \
+	data/xsession/openbox-kde-session
+
+noinst_PROGRAMS = \
+	tools/themetoxml/themetoxml
 
 ## render ##
 
 render_rendertest_CPPFLAGS = \
+	$(PANGO_CFLAGS) \
 	$(XFT_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) \
+	$(XFT_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) \
+	$(XFT_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) \
+	$(PANGO_LIBS) \
 	$(XFT_LIBS) \
-	$(GLIB_LIBS)
+	$(GLIB_LIBS) \
+	$(XML_LIBS)
 render_libobrender_la_SOURCES = \
 	gettext.h \
 	render/color.h \
@@ -58,6 +82,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 +101,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 +115,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 +157,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 \
@@ -153,6 +193,8 @@ openbox_openbox_SOURCES = \
 	openbox/menu.c \
 	openbox/menu.h \
 	openbox/misc.h \
+	openbox/modkeys.c \
+	openbox/modkeys.h \
 	openbox/mouse.c \
 	openbox/mouse.h \
 	openbox/moveresize.c \
@@ -166,6 +208,8 @@ openbox_openbox_SOURCES = \
 	openbox/popup.h \
 	openbox/prop.c \
 	openbox/prop.h \
+	openbox/propwin.c \
+	openbox/propwin.h \
 	openbox/resist.c \
 	openbox/resist.h \
 	openbox/screen.c \
@@ -174,8 +218,8 @@ openbox_openbox_SOURCES = \
 	openbox/session.h \
 	openbox/stacking.c \
 	openbox/stacking.h \
-	openbox/startup.c \
-	openbox/startup.h \
+	openbox/startupnotify.c \
+	openbox/startupnotify.h \
 	openbox/translate.c \
 	openbox/translate.h \
 	openbox/window.c \
@@ -183,93 +227,279 @@ openbox_openbox_SOURCES = \
 	openbox/xerror.c \
 	openbox/xerror.h
 
-## obconf ##
 
-tools_obconf_obconf_CPPFLAGS = \
-	$(GTK_CFLAGS) \
-	$(GDK_PIXBUF_CFLAGS) \
-	$(XML_CFLAGS) \
-	-DLOCALEDIR=\"$(localedir)\" \
-	-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
+## 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
+
+
+## default button masks ##
+dist_docxbm_DATA = \
+        data/xbm/bullet.xbm \
+        data/xbm/close.xbm \
+        data/xbm/desk_toggled.xbm \
+        data/xbm/desk.xbm \
+        data/xbm/iconify.xbm \
+        data/xbm/max_toggled.xbm \
+        data/xbm/max.xbm \
+        data/xbm/shade_toggled.xbm \
+        data/xbm/shade.xbm
 
 
 ## themes ##
 
-allegro_themedir = $(themedir)/allegro
-dist_allegro_theme_DATA = \
-	themes/allegro/themerc \
-	themes/allegro/bullet.xbm
-
-artwiz_themedir = $(themedir)/artwiz
-dist_artwiz_theme_DATA = \
-	themes/artwiz/themerc
-
-blah41_themedir = $(themedir)/blah41
-dist_blah41_theme_DATA = \
-	themes/blah41/themerc
-
-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
-
-thebear_themedir = $(themedir)/thebear
-dist_thebear_theme_DATA = \
-	themes/thebear/themerc
+clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
+dist_clearlooks_theme_DATA= \
+	themes/Clearlooks/openbox-3/themerc.xml
+
+clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
+dist_clearlooksolive_theme_DATA= \
+	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_hover.xbm \
+	themes/Natura/openbox-3/desk.xbm \
+	themes/Natura/openbox-3/iconify_hover.xbm \
+	themes/Natura/openbox-3/iconify.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/shade_hover.xbm \
+	themes/Natura/openbox-3/themerc.xml
+
+artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3
+dist_artwizboxed_theme_DATA= \
+	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_pressed.xbm \
+	themes/Bear2/openbox-3/iconify.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/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/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_pixmap_DATA = \
+	data/openbox.png
+
 dist_rc_DATA = \
-	data/rc3 \
-	data/menu
+	data/autostart.sh \
+	data/rc.xml \
+	data/menu.xml
+
+edit = $(SED) \
+	-e 's!@version\@!$(VERSION)!' \
+	-e 's!@configdir\@!$(configdir)!' \
+	-e 's!@bindir\@!$(bindir)!'
+
+data/xsession/openbox-gnome.desktop: \
+		$(srcdir)/data/xsession/openbox-gnome.desktop.in
+	@echo make: creating $@
+	@mkdir data 2>/dev/null || true
+	@mkdir data/xsession 2>/dev/null || true
+	@$(edit) $< >$@
+
+data/xsession/openbox-kde.desktop: \
+		$(srcdir)/data/xsession/openbox-kde.desktop.in
+	@echo make: creating $@
+	@mkdir data 2>/dev/null || true
+	@mkdir data/xsession 2>/dev/null || true
+	@$(edit) $< >$@
+
+data/xsession/openbox.desktop: \
+		$(srcdir)/data/xsession/openbox.desktop.in
+	@echo make: creating $@
+	@mkdir data 2>/dev/null || true
+	@mkdir data/xsession 2>/dev/null || true
+	@$(edit) $< >$@
+
+data/xsession/openbox-gnome-session: \
+		$(srcdir)/data/xsession/openbox-gnome-session.in
+	@echo make: creating $@
+	@mkdir data 2>/dev/null || true
+	@mkdir data/xsession 2>/dev/null || true
+	@$(edit) $< >$@
+	@chmod a+x $@
+
+data/xsession/openbox-kde-session: \
+		$(srcdir)/data/xsession/openbox-kde-session.in
+	@echo make: creating $@
+	@mkdir data 2>/dev/null || true
+	@mkdir data/xsession 2>/dev/null || true
+	@$(edit) $< >$@
+	@chmod a+x $@
+
+data/xsession/openbox-session: \
+		$(srcdir)/data/xsession/openbox-session.in
+	@echo make: creating $@
+	@mkdir data 2>/dev/null || true
+	@mkdir data/xsession 2>/dev/null || true
+	@$(edit) $< >$@
+	@chmod a+x $@
+
+%.1.in: %.1.sgml
+	@echo make: creating $@
+	@mkdir doc 2>/dev/null || true
+	@docbook-to-man $< >$@
+
+%.1: %.1.in
+	@echo make: creating $@
+	@mkdir doc 2>/dev/null || true
+	@$(edit) $< >$@	
+
+dist_gnomewmfiles_DATA = \
+	data/gnome-wm-properties/openbox.desktop
+
+nodist_xsessions_DATA = \
+	data/xsession/openbox.desktop \
+	data/xsession/openbox-gnome.desktop \
+	data/xsession/openbox-kde.desktop
+
+dist_noinst_DATA = \
+	version.h.in \
+	data/rc.xsd \
+	data/menu.xsd \
+	data/themerc.xsd \
+	data/xsession/openbox.desktop.in \
+	data/xsession/openbox-gnome.desktop.in \
+	data/xsession/openbox-kde.desktop.in \
+	data/xsession/openbox-session.in \
+	data/xsession/openbox-gnome-session.in \
+	data/xsession/openbox-kde-session.in \
+	doc/openbox.1.sgml \
+	doc/openbox.1.in \
+	doc/openbox-session.1.sgml \
+	doc/openbox-session.1.in \
+	doc/openbox-gnome-session.1.sgml \
+	doc/openbox-gnome-session.1.in \
+	doc/openbox-kde-session.1.sgml \
+	doc/openbox-kde-session.1.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
+
+dist_doc_DATA = \
+	COMPLIANCE \
+	README \
+	AUTHORS \
+	CHANGELOG \
+	COPYING \
+	data/rc.xsd \
+	data/menu.xsd \
+	data/themerc.xsd \
+	doc/rc-mouse-focus.xml
 
-dist_desktopfiles_DATA = \
-	data/openbox.desktop
+dist_man_MANS = \
+	doc/openbox.1 \
+	doc/openbox-session.1 \
+	doc/openbox-gnome-session.1 \
+	doc/openbox-kde-session.1
 
 EXTRA_DIST = \
+	debian/changelog.in \
+	debian/compat \
+	debian/conffiles \
+	debian/control \
+	debian/copyright \
+	debian/menu \
+	debian/postinst \
+	debian/postrm \
+	debian/rules \
 	config.rpath \
-	mkinstalldirs \
-	README \
-	COPYING \
-	AUTHORS
+	mkinstalldirs
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc