X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=00d7998ae91a169d967d20d4d0bd2573784ebde8;hb=51bc793e046c036fdeea3a9cad834c13fda2832f;hp=9ab7561f3daa6107cfbe5749bea21ccf94fd0312;hpb=07d5674d3984d008de1ecc768a296afbed731e4e;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 9ab7561f..00d7998a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,9 +8,11 @@ rcdir           = $(configdir)/openbox
 xsessionsdir    = $(datadir)/xsessions
 gnomewmfilesdir = $(datadir)/gnome/wm-properties
 pkgconfigdir    = $(libdir)/pkgconfig
-pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
+obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
+rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
+secretbindir    = $(libdir)/openbox
 
 theme = Clearlooks
 
@@ -24,13 +26,17 @@ check_PROGRAMS = \
 	render/rendertest
 
 lib_LTLIBRARIES = \
-	render/libobrender.la \
-	obt/libobt.la
+	obt/libobt.la \
+	render/libobrender.la
 
 bin_PROGRAMS = \
 	openbox/openbox \
+	tools/gdm-control/gdm-control \
 	tools/gnome-panel-control/gnome-panel-control
 
+dist_secretbin_SCRIPTS = \
+	tools/xdg-autostart/xdg-autostart
+
 nodist_bin_SCRIPTS = \
 	data/xsession/openbox-session \
 	data/xsession/openbox-gnome-session \
@@ -82,6 +88,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 \
@@ -129,7 +137,9 @@ obt_libobt_la_SOURCES = \
 	obt/paths.c \
 	obt/prop.h \
 	obt/prop.c \
-	obt/util.h
+	obt/util.h \
+	obt/xevent.h \
+	obt/xevent.c
 
 ## openbox ##
 
@@ -181,6 +191,7 @@ openbox_openbox_SOURCES = \
 	openbox/actions/if.c \
 	openbox/actions/kill.c \
 	openbox/actions/layer.c \
+	openbox/actions/session.c \
 	openbox/actions/lower.c \
 	openbox/actions/maximize.c \
 	openbox/actions/move.c \
@@ -233,6 +244,8 @@ openbox_openbox_SOURCES = \
 	openbox/grab.h \
 	openbox/group.c \
 	openbox/group.h \
+	openbox/hooks.c \
+	openbox/hooks.h \
 	openbox/keyboard.c \
 	openbox/keyboard.h \
 	openbox/keytree.c \
@@ -253,6 +266,8 @@ openbox_openbox_SOURCES = \
 	openbox/ping.h \
 	openbox/place.c \
 	openbox/place.h \
+	openbox/prompt.c \
+	openbox/prompt.h \
 	openbox/popup.c \
 	openbox/popup.h \
 	openbox/resist.c \
@@ -279,6 +294,17 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \
 tools_gnome_panel_control_gnome_panel_control_SOURCES = \
 	tools/gnome-panel-control/gnome-panel-control.c
 
+## gdm-control ##
+
+tools_gdm_control_gdm_control_CPPFLAGS = \
+	$(X_CFLAGS) \
+	$(GLIB_CFLAGS)
+tools_gdm_control_gdm_control_LDADD = \
+	$(X_LIBS) \
+	$(GLIB_LIBS)
+tools_gdm_control_gdm_control_SOURCES = \
+	tools/gdm-control/gdm-control.c
+
 
 ## default button masks ##
 dist_docxbm_DATA = \
@@ -299,6 +325,10 @@ clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
 dist_clearlooks_theme_DATA= \
 	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
@@ -370,7 +400,7 @@ dist_syscrash_theme_DATA= \
 
 ## public headers ##
 
-pubinclude_HEADERS = \
+rrpubinclude_HEADERS = \
 	render/color.h \
 	render/font.h \
 	render/geom.h \
@@ -380,22 +410,18 @@ pubinclude_HEADERS = \
 	render/mask.h \
 	render/render.h \
 	render/theme.h \
+	render/version.h
+
+obtpubinclude_HEADERS = \
 	obt/display.h \
-	obt/display.c \
 	obt/keyboard.h \
-	obt/keyboard.c \
 	obt/mainloop.h \
-	obt/mainloop.c \
 	obt/parse.h \
-	obt/parse.c \
 	obt/paths.h \
-	obt/paths.c \
 	obt/prop.h \
-	obt/prop.c \
-	obt/util.h
-
-nodist_pubinclude_HEADERS = \
-	version.h
+	obt/util.h \
+	obt/version.h \
+	obt/xevent.h
 
 nodist_pkgconfig_DATA = \
 	render/obrender-4.0.pc \
@@ -406,16 +432,23 @@ nodist_pkgconfig_DATA = \
 dist_pixmap_DATA = \
 	data/openbox.png
 
+nodist_rc_DATA = \
+	data/autostart.sh
+
 dist_rc_DATA = \
-	data/autostart.sh \
 	data/rc.xml \
 	data/menu.xml
 
 edit = $(SED) \
 	-e 's!@version\@!$(VERSION)!' \
 	-e 's!@configdir\@!$(configdir)!' \
+	-e 's!@secretbindir\@!$(secretbindir)!' \
 	-e 's!@bindir\@!$(bindir)!'
 
+data/autostart.sh: $(srcdir)/data/autostart.sh.in Makefile
+	@echo make: creating $@
+	@$(edit) $< >$@
+
 %.desktop: %.desktop.in Makefile
 	@echo make: creating $@
 	@$(edit) $< >$@	
@@ -441,7 +474,7 @@ nodist_xsessions_DATA = \
 	data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
-	version.h.in \
+	data/autostart.sh.in \
 	data/rc.xsd \
 	data/menu.xsd \
 	data/xsession/openbox.desktop.in \
@@ -458,8 +491,10 @@ dist_noinst_DATA = \
 	doc/openbox-gnome-session.1.in \
 	doc/openbox-kde-session.1.sgml \
 	doc/openbox-kde-session.1.in \
+	render/version.h.in \
 	render/obrender-4.0.pc.in \
 	obt/obt-4.0.pc.in \
+	obt/version.h.in \
 	tools/themeupdate/themeupdate.py \
 	tests/hideshow.py \
 	tests/Makefile \