Add an openbox.desktop file for the applications/ directory

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fe704cb59e26cb2f86e24a1a0b9cfe8a0e1833cb..660b5ef5f6cbf2569fe2cc2f1d7ade226c84d757 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,7 @@ pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
 secretbindir    = $(libdir)/openbox
+appsdir         = $(datadir)/applications
 
 theme = Clearlooks
 
@@ -30,6 +31,7 @@ lib_LTLIBRARIES = \
 
 bin_PROGRAMS = \
        openbox/openbox \
+       tools/gdm-control/gdm-control \
        tools/gnome-panel-control/gnome-panel-control
 
 dist_secretbin_SCRIPTS = \
@@ -286,6 +288,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 = \
@@ -402,11 +415,16 @@ nodist_pkgconfig_DATA = \
 
 ## data ##
 
+dist_apps_DATA = \
+       data/openbox.desktop
+
 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 +464,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 \