Merge branch 'backport' into work

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9027759645da35fb110ab6437ae9ca5dfb3dc07a..00d7998ae91a169d967d20d4d0bd2573784ebde8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,6 +31,7 @@ lib_LTLIBRARIES = \
 
 bin_PROGRAMS = \
        openbox/openbox \
+       tools/gdm-control/gdm-control \
        tools/gnome-panel-control/gnome-panel-control
 
 dist_secretbin_SCRIPTS = \
@@ -190,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 \
@@ -292,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 = \