diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-03-02 04:18:17 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-03-02 04:19:05 -0500 |
| commit | 37705f444eecabb2e5bd31e92bc8b82ae9b8b596 (patch) | |
| tree | 6c2ef624542f53985773b3399ca49baacbbf7d77 /Makefile.am | |
| parent | a47d0a53652a96ca1df96fc9268757df1431ae55 (diff) | |
| parent | e8ce4dbb8fa8f415759745d57bb1c971ea360ec5 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/actions/all.h
openbox/event.c
openbox/prompt.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 90277596..00d7998a 100644 --- 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 = \ |