X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=23e3bda7398d484b1dc18b32f63c5476586cd370;hb=de0873824e3072bf6c6f8ae24569ef7bf7a0017a;hp=b34bfc598e37b7968780770dca6bc69a2dffc778;hpb=0fcf5ead0fb38710e6277da8b59c6ad19f907092;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index b34bfc59..23e3bda7 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/@OB_VERSION@/openbox
+obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt/
+rrpubincludedir = $(includedir)/openbox/@RR_VERSION@/render/
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
 
@@ -24,7 +25,6 @@ check_PROGRAMS = \
 	render/rendertest
 
 lib_LTLIBRARIES = \
-	parser/libobparser.la \
 	render/libobrender.la \
 	obt/libobt.la
 
@@ -45,7 +45,7 @@ render_rendertest_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
-	parser/libobparser.la \
+	obt/libobt.la \
 	render/libobrender.la \
 	$(GLIB_LIBS) \
 	$(PANGO_LIBS) \
@@ -65,7 +65,7 @@ render_libobrender_la_CPPFLAGS = \
 render_libobrender_la_LDFLAGS = \
 	-version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
 render_libobrender_la_LIBADD = \
-	parser/libobparser.la \
+	obt/libobt.la \
 	$(X_LIBS) \
 	$(PANGO_LIBS) \
 	$(XFT_LIBS) \
@@ -92,24 +92,6 @@ render_libobrender_la_SOURCES = \
 	render/theme.h \
 	render/theme.c
 
-## parser ##
-
-parser_libobparser_la_CPPFLAGS = \
-	$(GLIB_CFLAGS) \
-	$(XML_CFLAGS) \
-	-DG_LOG_DOMAIN=\"ObParser\" \
-	-DLOCALEDIR=\"$(localedir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DCONFIGDIR=\"$(configdir)\"
-parser_libobparser_la_LDFLAGS = \
-	-version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
-parser_libobparser_la_LIBADD = \
-	$(GLIB_LIBS) \
-	$(XML_LIBS) 
-parser_libobparser_la_SOURCES = \
-	parser/parse.h \
-	parser/parse.c
-
 ## obt ##
 
 obt_libobt_la_CPPFLAGS = \
@@ -119,6 +101,7 @@ obt_libobt_la_CPPFLAGS = \
 	$(XSHAPE_CFLAGS) \
 	$(XSYNC_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(XML_CFLAGS) \
 	-DG_LOG_DOMAIN=\"Obt\" \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DDATADIR=\"$(datadir)\" \
@@ -131,15 +114,25 @@ obt_libobt_la_LIBADD = \
 	$(XRANDR_LIBS) \
 	$(XSHAPE_LIBS) \
 	$(XSYNC_LIBS) \
-	$(GLIB_LIBS)
+	$(GLIB_LIBS) \
+	$(XML_LIBS)
 obt_libobt_la_SOURCES = \
 	obt/display.h \
 	obt/display.c \
+	obt/internal.h \
+	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/util.h \
+	obt/xevent.h \
+	obt/xevent.c
 
 ## openbox ##
 
@@ -166,7 +159,6 @@ openbox_openbox_LDADD = \
 	$(EFENCE_LIBS) \
 	$(LIBINTL) \
 	render/libobrender.la \
-	parser/libobparser.la \
 	obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
 openbox_openbox_SOURCES = \
@@ -253,8 +245,6 @@ openbox_openbox_SOURCES = \
 	openbox/menu.c \
 	openbox/menu.h \
 	openbox/misc.h \
-	openbox/modkeys.c \
-	openbox/modkeys.h \
 	openbox/mouse.c \
 	openbox/mouse.h \
 	openbox/moveresize.c \
@@ -312,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
@@ -383,7 +377,7 @@ dist_syscrash_theme_DATA= \
 
 ## public headers ##
 
-pubinclude_HEADERS = \
+rrpubinclude_HEADERS = \
 	render/color.h \
 	render/font.h \
 	render/geom.h \
@@ -393,17 +387,21 @@ pubinclude_HEADERS = \
 	render/mask.h \
 	render/render.h \
 	render/theme.h \
-	parser/parse.h \
+	render/version.h
+
+obtpubinclude_HEADERS = \
 	obt/display.h \
+	obt/keyboard.h \
 	obt/mainloop.h \
-	obt/util.h
-
-nodist_pubinclude_HEADERS = \
-	version.h
+	obt/parse.h \
+	obt/paths.h \
+	obt/prop.h \
+	obt/util.h \
+	obt/version.h \
+	obt/xevent.h
 
 nodist_pkgconfig_DATA = \
 	render/obrender-4.0.pc \
-	parser/obparser-4.0.pc \
 	obt/obt-4.0.pc
 
 ## data ##
@@ -446,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 \
@@ -463,9 +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 \
-	parser/obparser-4.0.pc.in \
 	obt/obt-4.0.pc.in \
+	obt/version.h.in \
 	tools/themeupdate/themeupdate.py \
 	tests/hideshow.py \
 	tests/Makefile \