X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=fc873bb113eef1e4ded1266d8920647e76a11a53;hb=0e9cfd7c77d8608a4be29f43413575d9553bf21c;hp=9b3140c3fb19e6656f45758658c526cd90208642;hpb=5563e251c36a1fbda703cf4bc3c8c6ae543829bd;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 9b3140c3..fc873bb1 100644
--- 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
 
@@ -255,6 +256,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 +379,7 @@ dist_syscrash_theme_DATA= \
 
 ## public headers ##
 
-pubinclude_HEADERS = \
+rrpubinclude_HEADERS = \
 	render/color.h \
 	render/font.h \
 	render/geom.h \
@@ -386,24 +389,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/paths.c \
 	obt/prop.h \
-	obt/prop.c \
 	obt/util.h \
-	obt/xevent.h \
-	obt/xevent.c
-
-nodist_pubinclude_HEADERS = \
-	version.h
+	obt/version.h \
+	obt/xevent.h
 
 nodist_pkgconfig_DATA = \
 	render/obrender-4.0.pc \
@@ -449,7 +446,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 \
@@ -466,8 +462,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 \