X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=fa8f65d323105c2e238801fd3f73313f2d8bd0a2;hb=b1dc814128c2cd402ef7b6717348a795a3c0ad14;hp=49719143da14d18a643891da6be20c7b2a7adfb9;hpb=83eb9220122d98ac72d1b6aa636d1da52d3832e2;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 49719143..fa8f65d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,7 @@ pkgconfigdir    = $(libdir)/pkgconfig
 pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
+secretbindir    = $(libdir)/openbox
 
 theme = Clearlooks
 
@@ -31,14 +32,14 @@ bin_PROGRAMS = \
 	openbox/openbox \
 	tools/gnome-panel-control/gnome-panel-control
 
+secretbin_SCRIPTS = \
+	tools/xdg-autostart/xdg-autostart
+
 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 = \
@@ -85,6 +86,8 @@ render_libobrender_la_SOURCES = \
 	render/icon.h \
 	render/image.h \
 	render/image.c \
+	render/imagecache.h \
+	render/imagecache.c \
 	render/instance.h \
 	render/instance.c \
 	render/mask.h \
@@ -151,8 +154,46 @@ 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/directionalwindows.c \
+	openbox/actions/execute.c \
+	openbox/actions/exit.c \
+	openbox/actions/focus.c \
+	openbox/actions/focustobottom.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/move.c \
+	openbox/actions/moverelative.c \
+	openbox/actions/moveresizeto.c \
+	openbox/actions/movetoedge.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/showmenu.c \
+	openbox/actions/unfocus.c \
+	openbox/actions.c \
+	openbox/actions.h \
 	openbox/client.c \
 	openbox/client.h \
 	openbox/client_list_menu.c \
@@ -208,14 +249,16 @@ openbox_openbox_SOURCES = \
 	openbox/mwm.h \
 	openbox/openbox.c \
 	openbox/openbox.h \
+	openbox/ping.c \
+	openbox/ping.h \
 	openbox/place.c \
 	openbox/place.h \
+	openbox/prompt.c \
+	openbox/prompt.h \
 	openbox/popup.c \
 	openbox/popup.h \
 	openbox/prop.c \
 	openbox/prop.h \
-	openbox/propwin.c \
-	openbox/propwin.h \
 	openbox/resist.c \
 	openbox/resist.h \
 	openbox/screen.c \
@@ -234,21 +277,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 = \
@@ -276,11 +304,15 @@ dist_docxbm_DATA = \
 
 clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
 dist_clearlooks_theme_DATA= \
-	themes/Clearlooks/openbox-3/themerc.xml
+	themes/Clearlooks/openbox-3/themerc
+
+clearlooks34_themedir = $(themedir)/Clearlooks/openbox-3
+dist_clearlooks34_theme_DATA= \
+	themes/Clearlooks-3.4/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= \
@@ -289,7 +321,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
@@ -306,11 +338,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= \
@@ -325,11 +357,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= \
@@ -337,7 +377,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,61 +413,27 @@ dist_rc_DATA = \
 edit = $(SED) \
 	-e 's!@version\@!$(VERSION)!' \
 	-e 's!@configdir\@!$(configdir)!' \
+	-e 's!@secretbindir\@!$(secretbindir)!' \
 	-e 's!@bindir\@!$(bindir)!'
 
-data/xsession/openbox-gnome.desktop: \
-		$(srcdir)/data/xsession/openbox-gnome.desktop.in
+data/autostart.sh: $(srcdir)/data/autostart.sh.in Makefile
 	@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
+%.desktop: %.desktop.in Makefile
 	@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 $@
+	@$(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 = \
@@ -442,7 +448,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 \
@@ -485,27 +490,30 @@ 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 \
 	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
+	config.rpath
+
+# 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