X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=00d7998ae91a169d967d20d4d0bd2573784ebde8;hb=722a712b8c8884cab44bedcb53fa3e13f4c29edc;hp=dd5bb6c542f8dbe315eebb253114b9d8bcbc4647;hpb=198d98986bdf224ed29361541d19841339953088;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index dd5bb6c5..00d7998a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,7 @@ obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
 rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
+secretbindir    = $(libdir)/openbox
 
 theme = Clearlooks
 
@@ -25,14 +26,15 @@ 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
 
-bin_SCRIPTS = \
+dist_secretbin_SCRIPTS = \
 	tools/xdg-autostart/xdg-autostart
 
 nodist_bin_SCRIPTS = \
@@ -189,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 \
@@ -241,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 \
@@ -289,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 = \
@@ -416,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) $< >$@	
@@ -451,6 +474,7 @@ nodist_xsessions_DATA = \
 	data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
+	data/autostart.sh.in \
 	data/rc.xsd \
 	data/menu.xsd \
 	data/xsession/openbox.desktop.in \