Remove autostart.sh when cleaning too.

[mikachu/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f061a0f..f959d8a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,7 @@ pkgconfigdir    = $(libdir)/pkgconfig
 pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
+secretbindir    = $(libdir)/openbox
 
 theme = Clearlooks
 
@@ -29,9 +30,10 @@ lib_LTLIBRARIES = \
 
 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 = \
@@ -173,6 +175,7 @@ openbox_openbox_SOURCES = \
        openbox/actions/iconify.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 \
@@ -285,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 = \
@@ -404,16 +418,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) $< >$@ 
@@ -440,6 +461,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 \
@@ -507,7 +529,8 @@ CLEANFILES = \
        data/xsession/openbox-kde-session \
        data/xsession/openbox.desktop \
        data/xsession/openbox-gnome.desktop \
-       data/xsession/openbox-kde.desktop
+       data/xsession/openbox-kde.desktop \
+       data/autostart.sh
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc