X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=798422b3352d2e0e6967a9b131ea5d9f1f1ee209;hb=b32181ac69d3aa18756348991028f809cb2ee046;hp=515c6dc7da7c09352bf21ccffde4cda67fc88d57;hpb=eb09b1873d731a0e7290334a832a76cb233f34a7;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 515c6dc7..798422b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,9 +36,6 @@ nodist_bin_SCRIPTS = \
 	data/xsession/openbox-gnome-session \
 	data/xsession/openbox-kde-session
 
-noinst_PROGRAMS = \
-	tools/themetoxml/themetoxml
-
 ## render ##
 
 render_rendertest_CPPFLAGS = \
@@ -121,6 +118,9 @@ openbox_openbox_CPPFLAGS = \
 	$(XRANDR_CFLAGS) \
 	$(XSHAPE_CFLAGS) \
 	$(XSYNC_CFLAGS) \
+	$(XRENDER_CFLAGS) \
+	$(XDAMAGE_CFLAGS) \
+	$(XCOMPOSITE_CFLAGS) \
 	$(X_CFLAGS) \
 	$(XCURSOR_CFLAGS) \
 	$(SM_CFLAGS) \
@@ -140,6 +140,9 @@ openbox_openbox_LDADD = \
 	$(XSHAPE_LIBS) \
 	$(XSYNC_LIBS) \
 	$(GLIB_LIBS) \
+	$(XRENDER_LIBS) \
+	$(XDAMAGE_LIBS) \
+	$(XCOMPOSITE_LIBS) \
 	$(X_LIBS) \
 	$(XCURSOR_LIBS) \
 	$(LIBSN_LIBS) \
@@ -151,8 +154,49 @@ openbox_openbox_LDADD = \
 openbox_openbox_LDFLAGS = -export-dynamic
 openbox_openbox_SOURCES = \
 	gettext.h \
-	openbox/action.c \
-	openbox/action.h \
+	openbox/actions/all.c \
+	openbox/actions/all.h \
+	openbox/actions/addremovedesktop.c \
+	openbox/actions/breakchroot.c \
+	openbox/actions/close.c \
+	openbox/actions/cyclewindows.c \
+	openbox/actions/debug.c \
+	openbox/actions/decorations.c \
+	openbox/actions/desktop.c \
+	openbox/actions/dockautohide.c \
+	openbox/actions/directionalcyclewindows.c \
+	openbox/actions/directionaldesktop.c \
+	openbox/actions/directionaltargetwindow.c \
+	openbox/actions/execute.c \
+	openbox/actions/exit.c \
+	openbox/actions/focus.c \
+	openbox/actions/fullscreen.c \
+	openbox/actions/growtoedge.c \
+	openbox/actions/iconify.c \
+	openbox/actions/if.c \
+	openbox/actions/kill.c \
+	openbox/actions/layer.c \
+	openbox/actions/lower.c \
+	openbox/actions/maximize.c \
+	openbox/actions/maximizehorizontal.c \
+	openbox/actions/maximizevertical.c \
+	openbox/actions/menu.c \
+	openbox/actions/move.c \
+	openbox/actions/moverelative.c \
+	openbox/actions/moveto.c \
+	openbox/actions/movetofromedge.c \
+	openbox/actions/omnipresent.c \
+	openbox/actions/raise.c \
+	openbox/actions/raiselower.c \
+	openbox/actions/reconfigure.c \
+	openbox/actions/resize.c \
+	openbox/actions/resizerelative.c \
+	openbox/actions/restart.c \
+	openbox/actions/shade.c \
+	openbox/actions/showdesktop.c \
+	openbox/actions/unfocus.c \
+	openbox/actions.c \
+	openbox/actions.h \
 	openbox/client.c \
 	openbox/client.h \
 	openbox/client_list_menu.c \
@@ -161,6 +205,8 @@ openbox_openbox_SOURCES = \
 	openbox/client_list_combined_menu.h \
 	openbox/client_menu.c \
 	openbox/client_menu.h \
+	openbox/composite.c \
+	openbox/composite.h \
 	openbox/config.c \
 	openbox/config.h \
 	openbox/debug.c \
@@ -177,6 +223,8 @@ openbox_openbox_SOURCES = \
 	openbox/focus_cycle.h \
 	openbox/focus_cycle_indicator.c \
 	openbox/focus_cycle_indicator.h \
+	openbox/focus_cycle_popup.c \
+	openbox/focus_cycle_popup.h \
 	openbox/frame.c \
 	openbox/frame.h \
 	openbox/framerender.c \
@@ -232,21 +280,6 @@ openbox_openbox_SOURCES = \
 	openbox/xerror.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
-
-
 ## gnome-panel-control ##
 
 tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \
@@ -274,11 +307,11 @@ dist_docxbm_DATA = \
 
 clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
 dist_clearlooks_theme_DATA= \
-	themes/Clearlooks/openbox-3/themerc.xml
+	themes/Clearlooks/openbox-3/themerc
 
 clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
 dist_clearlooksolive_theme_DATA= \
-	themes/Clearlooks-Olive/openbox-3/themerc.xml
+	themes/Clearlooks-Olive/openbox-3/themerc
 
 mikachu_themedir = $(themedir)/Mikachu/openbox-3
 dist_mikachu_theme_DATA= \
@@ -287,7 +320,7 @@ dist_mikachu_theme_DATA= \
 	themes/Mikachu/openbox-3/desk.xbm \
 	themes/Mikachu/openbox-3/iconify.xbm \
 	themes/Mikachu/openbox-3/max.xbm \
-	themes/Mikachu/openbox-3/themerc.xml
+	themes/Mikachu/openbox-3/themerc
 
 
 natura_themedir = $(themedir)/Natura/openbox-3
@@ -304,11 +337,11 @@ dist_natura_theme_DATA= \
 	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
+	themes/Natura/openbox-3/themerc
 
 artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3
 dist_artwizboxed_theme_DATA= \
-	themes/Artwiz-boxed/openbox-3/themerc.xml
+	themes/Artwiz-boxed/openbox-3/themerc
 
 bear2_themedir = $(themedir)/Bear2/openbox-3
 dist_bear2_theme_DATA= \
@@ -323,11 +356,19 @@ dist_bear2_theme_DATA= \
 	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
+	themes/Bear2/openbox-3/themerc
 
 orang_themedir = $(themedir)/Orang/openbox-3
 dist_orang_theme_DATA= \
-	themes/Orang/openbox-3/themerc.xml
+	themes/Orang/openbox-3/themerc
+
+onyx_themedir = $(themedir)/Onyx/openbox-3
+dist_onyx_theme_DATA= \
+	themes/Onyx/openbox-3/themerc
+
+onyxcitrus_themedir = $(themedir)/Onyx-Citrus/openbox-3
+dist_onyxcitrus_theme_DATA= \
+	themes/Onyx-Citrus/openbox-3/themerc
 
 syscrash_themedir = $(themedir)/Syscrash/openbox-3
 dist_syscrash_theme_DATA= \
@@ -335,7 +376,7 @@ dist_syscrash_theme_DATA= \
 	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
+	themes/Syscrash/openbox-3/themerc
 
 ## public headers ##
 
@@ -373,59 +414,20 @@ edit = $(SED) \
 	-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
+%.desktop: %.desktop.in Makefile
 	@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 $@
+	@$(edit) $< >$@	
 
-data/xsession/openbox-session: \
-		$(srcdir)/data/xsession/openbox-session.in
+%-session: %-session.in Makefile
 	@echo make: creating $@
-	@mkdir data 2>/dev/null || true
-	@mkdir data/xsession 2>/dev/null || true
-	@$(edit) $< >$@
-	@chmod a+x $@
+	@$(edit) $< >$@	
 
 %.1.in: %.1.sgml
 	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
 	@docbook-to-man $< >$@
 
-%.1: %.1.in
+%.1: %.1.in Makefile
 	@echo make: creating $@
-	@mkdir doc 2>/dev/null || true
 	@$(edit) $< >$@	
 
 dist_gnomewmfiles_DATA = \
@@ -440,7 +442,6 @@ 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 \
@@ -483,10 +484,9 @@ dist_doc_DATA = \
 	COPYING \
 	data/rc.xsd \
 	data/menu.xsd \
-	data/themerc.xsd \
 	doc/rc-mouse-focus.xml
 
-dist_man_MANS = \
+nodist_man_MANS = \
 	doc/openbox.1 \
 	doc/openbox-session.1 \
 	doc/openbox-gnome-session.1 \
@@ -505,6 +505,20 @@ EXTRA_DIST = \
 	config.rpath \
 	mkinstalldirs
 
+# make clean doesn't delete these for some reason, even though they are
+# built by make
+CLEANFILES = \
+	doc/openbox.1 \
+	doc/openbox-session.1 \
+	doc/openbox-gnome-session.1 \
+	doc/openbox-kde-session.1 \
+	data/xsession/openbox-session \
+	data/xsession/openbox-gnome-session \
+	data/xsession/openbox-kde-session \
+	data/xsession/openbox.desktop \
+	data/xsession/openbox-gnome.desktop \
+	data/xsession/openbox-kde.desktop
+
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc