split the version.h into render/ and obt/ copies, with the appropriate version info

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ed68b185f1292de65e8df0a13397d94f4830e1ac..23e3bda7398d484b1dc18b32f63c5476586cd370 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/@OB_VERSION@/openbox
+obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt/
+rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render/
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
 
@@ -125,9 +126,13 @@ obt_libobt_la_SOURCES = \
        obt/mainloop.c \
        obt/parse.h \
        obt/parse.c \
+       obt/paths.h \
+       obt/paths.c \
        obt/prop.h \
        obt/prop.c \
-       obt/util.h
+       obt/util.h \
+       obt/xevent.h \
+       obt/xevent.c
 
 ## openbox ##
 
@@ -297,6 +302,10 @@ clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
 dist_clearlooks_theme_DATA= \
        themes/Clearlooks/openbox-3/themerc
 
+clearlooks34_themedir = $(themedir)/Clearlooks/openbox-3
+dist_clearlooks34_theme_DATA= \
+       themes/Clearlooks-3.4/openbox-3/themerc
+
 clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
 dist_clearlooksolive_theme_DATA= \
        themes/Clearlooks-Olive/openbox-3/themerc
@@ -368,7 +377,7 @@ dist_syscrash_theme_DATA= \
 
 ## public headers ##
 
-pubinclude_HEADERS = \
+rrpubinclude_HEADERS = \
        render/color.h \
        render/font.h \
        render/geom.h \
@@ -378,20 +387,18 @@ pubinclude_HEADERS = \
        render/mask.h \
        render/render.h \
        render/theme.h \
+       render/version.h
+
+obtpubinclude_HEADERS = \
        obt/display.h \
-       obt/display.c \
        obt/keyboard.h \
-       obt/keyboard.c \
        obt/mainloop.h \
-       obt/mainloop.c \
        obt/parse.h \
-       obt/parse.c \
+       obt/paths.h \
        obt/prop.h \
-       obt/prop.c \
-       obt/util.h
-
-nodist_pubinclude_HEADERS = \
-       version.h
+       obt/util.h \
+       obt/version.h \
+       obt/xevent.h
 
 nodist_pkgconfig_DATA = \
        render/obrender-4.0.pc \
@@ -437,7 +444,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 \
@@ -454,8 +460,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 \