Merge branch 'backport' into work

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dd5bb6c542f8dbe315eebb253114b9d8bcbc4647..9027759645da35fb110ab6437ae9ca5dfb3dc07a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,7 @@ obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
 rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
+secretbindir    = $(libdir)/openbox
 
 theme = Clearlooks
 
@@ -25,14 +26,14 @@ check_PROGRAMS = \
        render/rendertest
 
 lib_LTLIBRARIES = \
-       render/libobrender.la \
-       obt/libobt.la
+       obt/libobt.la \
+       render/libobrender.la
 
 bin_PROGRAMS = \
        openbox/openbox \
        tools/gnome-panel-control/gnome-panel-control
 
-bin_SCRIPTS = \
+dist_secretbin_SCRIPTS = \
        tools/xdg-autostart/xdg-autostart
 
 nodist_bin_SCRIPTS = \
@@ -241,6 +242,8 @@ openbox_openbox_SOURCES = \
        openbox/grab.h \
        openbox/group.c \
        openbox/group.h \
+       openbox/hooks.c \
+       openbox/hooks.h \
        openbox/keyboard.c \
        openbox/keyboard.h \
        openbox/keytree.c \
@@ -416,16 +419,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) $< >$@ 
@@ -451,6 +461,7 @@ nodist_xsessions_DATA = \
        data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
+       data/autostart.sh.in \
        data/rc.xsd \
        data/menu.xsd \
        data/xsession/openbox.desktop.in \