Merge branch 'backport' into work

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d99fa30be050b31268e857e4e46c951c0b1cb455..dd5bb6c542f8dbe315eebb253114b9d8bcbc4647 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,8 @@ rcdir           = $(configdir)/openbox
 xsessionsdir    = $(datadir)/xsessions
 gnomewmfilesdir = $(datadir)/gnome/wm-properties
 pkgconfigdir    = $(libdir)/pkgconfig
-pubincludedir   = $(includedir)/openbox/@OBT_VERSION@/openbox
+obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
+rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
 
@@ -31,6 +32,9 @@ bin_PROGRAMS = \
        openbox/openbox \
        tools/gnome-panel-control/gnome-panel-control
 
+bin_SCRIPTS = \
+       tools/xdg-autostart/xdg-autostart
+
 nodist_bin_SCRIPTS = \
        data/xsession/openbox-session \
        data/xsession/openbox-gnome-session \
@@ -82,6 +86,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 \
@@ -255,6 +261,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 \
@@ -376,7 +384,7 @@ dist_syscrash_theme_DATA= \
 
 ## public headers ##
 
-pubinclude_HEADERS = \
+rrpubinclude_HEADERS = \
        render/color.h \
        render/font.h \
        render/geom.h \
@@ -386,7 +394,9 @@ pubinclude_HEADERS = \
        render/mask.h \
        render/render.h \
        render/theme.h \
-       render/version.h \
+       render/version.h
+
+obtpubinclude_HEADERS = \
        obt/display.h \
        obt/keyboard.h \
        obt/mainloop.h \
@@ -397,9 +407,6 @@ pubinclude_HEADERS = \
        obt/version.h \
        obt/xevent.h
 
-nodist_pubinclude_HEADERS = \
-       version.h
-
 nodist_pkgconfig_DATA = \
        render/obrender-4.0.pc \
        obt/obt-4.0.pc
@@ -444,7 +451,6 @@ nodist_xsessions_DATA = \
        data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
-       version.h.in \
        data/rc.xsd \
        data/menu.xsd \
        data/xsession/openbox.desktop.in \
@@ -461,8 +467,10 @@ dist_noinst_DATA = \
        doc/openbox-gnome-session.1.in \
        doc/openbox-kde-session.1.sgml \
        doc/openbox-kde-session.1.in \
+       render/version.h.in \
        render/obrender-4.0.pc.in \
        obt/obt-4.0.pc.in \
+       obt/version.h.in \
        tools/themeupdate/themeupdate.py \
        tests/hideshow.py \
        tests/Makefile \