Merge branch 'backport' into work

[dana/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7eaa194..ec6157b 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
 
@@ -32,6 +33,9 @@ bin_PROGRAMS = \
        openbox/openbox \
        tools/gnome-panel-control/gnome-panel-control
 
+secretbin_SCRIPTS = \
+       tools/xdg-autostart/xdg-autostart
+
 nodist_bin_SCRIPTS = \
        data/xsession/openbox-session \
        data/xsession/openbox-gnome-session \
@@ -83,6 +87,8 @@ render_libobrender_la_SOURCES = \
        render/icon.h \
        render/image.h \
        render/image.c \
+       render/imagecache.h \
+       render/imagecache.c \
        render/instance.h \
        render/instance.c \
        render/mask.h \
@@ -256,6 +262,8 @@ openbox_openbox_SOURCES = \
        openbox/ping.h \
        openbox/place.c \
        openbox/place.h \
+       openbox/prompt.c \
+       openbox/prompt.h \
        openbox/popup.c \
        openbox/popup.h \
        openbox/resist.c \
@@ -417,8 +425,13 @@ dist_rc_DATA = \
 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) $< >$@