Combine the Exit and SessionLogout actions

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fa8f65d323105c2e238801fd3f73313f2d8bd0a2..5c312c729f6d4e59ba13e101298d62a80454cd22 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,9 +30,10 @@ lib_LTLIBRARIES = \
 
 bin_PROGRAMS = \
        openbox/openbox \
+       tools/gdm-control/gdm-control \
        tools/gnome-panel-control/gnome-panel-control
 
-secretbin_SCRIPTS = \
+dist_secretbin_SCRIPTS = \
        tools/xdg-autostart/xdg-autostart
 
 nodist_bin_SCRIPTS = \
@@ -286,6 +287,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 = \
@@ -405,8 +417,10 @@ 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
 
@@ -446,6 +460,7 @@ nodist_xsessions_DATA = \
 
 dist_noinst_DATA = \
        version.h.in \
+       data/autostart.sh.in \
        data/rc.xsd \
        data/menu.xsd \
        data/xsession/openbox.desktop.in \