X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=9b3140c3fb19e6656f45758658c526cd90208642;hb=20b8fcfa33feeade5946bc7f3046705da5d164fe;hp=b7710247d3f11b5c99375b259f9137b26af9333b;hpb=d11ac82062d729be5d63c9c40c5c2bb312a8b8f1;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index b7710247..9b3140c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ rcdir           = $(configdir)/openbox
 xsessionsdir    = $(datadir)/xsessions
 gnomewmfilesdir = $(datadir)/gnome/wm-properties
 pkgconfigdir    = $(libdir)/pkgconfig
-pubincludedir   = $(includedir)/openbox/@OB_VERSION@/openbox
+pubincludedir   = $(includedir)/openbox/@OBT_VERSION@/openbox
 pixmapdir       = $(datadir)/pixmaps
 xsddir          = $(datadir)/openbox
 
@@ -24,8 +24,8 @@ check_PROGRAMS = \
 	render/rendertest
 
 lib_LTLIBRARIES = \
-	parser/libobparser.la \
-	render/libobrender.la
+	render/libobrender.la \
+	obt/libobt.la
 
 bin_PROGRAMS = \
 	openbox/openbox \
@@ -44,7 +44,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) \
@@ -62,9 +62,9 @@ render_libobrender_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"ObRender\" \
 	-DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+	-version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
 render_libobrender_la_LIBADD = \
-	parser/libobparser.la \
+	obt/libobt.la \
 	$(X_LIBS) \
 	$(PANGO_LIBS) \
 	$(XFT_LIBS) \
@@ -91,33 +91,52 @@ render_libobrender_la_SOURCES = \
 	render/theme.h \
 	render/theme.c
 
-## parser ##
+## obt ##
 
-parser_libobparser_la_CPPFLAGS = \
+obt_libobt_la_CPPFLAGS = \
+	$(XINERAMA_CFLAGS) \
+	$(XKB_CFLAGS) \
+	$(XRANDR_CFLAGS) \
+	$(XSHAPE_CFLAGS) \
+	$(XSYNC_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(XML_CFLAGS) \
-	-DG_LOG_DOMAIN=\"ObParser\" \
+	-DG_LOG_DOMAIN=\"Obt\" \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DCONFIGDIR=\"$(configdir)\"
-parser_libobparser_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-parser_libobparser_la_LIBADD = \
+obt_libobt_la_LDFLAGS = \
+	-version-info $(OBT_CURRENT):$(OBT_REVISION):$(OBT_AGE)
+obt_libobt_la_LIBADD = \
+	$(XINERAMA_LIBS) \
+	$(XKB_LIBS) \
+	$(XRANDR_LIBS) \
+	$(XSHAPE_LIBS) \
+	$(XSYNC_LIBS) \
 	$(GLIB_LIBS) \
-	$(XML_LIBS) 
-parser_libobparser_la_SOURCES = \
-	parser/parse.h \
-	parser/parse.c
+	$(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/xevent.h \
+	obt/xevent.c
 
 ## openbox ##
 
 openbox_openbox_CPPFLAGS = \
 	$(SM_CFLAGS) \
-	$(XINERAMA_CFLAGS) \
-	$(XKB_CFLAGS) \
-	$(XRANDR_CFLAGS) \
-	$(XSHAPE_CFLAGS) \
-	$(XSYNC_CFLAGS) \
 	$(X_CFLAGS) \
 	$(XCURSOR_CFLAGS) \
 	$(SM_CFLAGS) \
@@ -131,11 +150,6 @@ openbox_openbox_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
 	$(SM_LIBS) \
-	$(XINERAMA_LIBS) \
-	$(XKB_LIBS) \
-	$(XRANDR_LIBS) \
-	$(XSHAPE_LIBS) \
-	$(XSYNC_LIBS) \
 	$(GLIB_LIBS) \
 	$(X_LIBS) \
 	$(XCURSOR_LIBS) \
@@ -144,7 +158,7 @@ openbox_openbox_LDADD = \
 	$(EFENCE_LIBS) \
 	$(LIBINTL) \
 	render/libobrender.la \
-	parser/libobparser.la
+	obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
 openbox_openbox_SOURCES = \
 	gettext.h \
@@ -204,8 +218,6 @@ openbox_openbox_SOURCES = \
 	openbox/dock.h \
 	openbox/event.c \
 	openbox/event.h \
-	openbox/extensions.c \
-	openbox/extensions.h \
 	openbox/focus.c \
 	openbox/focus.h \
 	openbox/focus_cycle.c \
@@ -227,15 +239,11 @@ openbox_openbox_SOURCES = \
 	openbox/keyboard.h \
 	openbox/keytree.c \
 	openbox/keytree.h \
-	openbox/mainloop.c \
-	openbox/mainloop.h \
 	openbox/menuframe.c \
 	openbox/menuframe.h \
 	openbox/menu.c \
 	openbox/menu.h \
 	openbox/misc.h \
-	openbox/modkeys.c \
-	openbox/modkeys.h \
 	openbox/mouse.c \
 	openbox/mouse.h \
 	openbox/moveresize.c \
@@ -249,8 +257,6 @@ openbox_openbox_SOURCES = \
 	openbox/place.h \
 	openbox/popup.c \
 	openbox/popup.h \
-	openbox/prop.c \
-	openbox/prop.h \
 	openbox/resist.c \
 	openbox/resist.h \
 	openbox/screen.c \
@@ -264,10 +270,7 @@ openbox_openbox_SOURCES = \
 	openbox/translate.c \
 	openbox/translate.h \
 	openbox/window.c \
-	openbox/window.h \
-	openbox/xerror.c \
-	openbox/xerror.h
-
+	openbox/window.h
 
 ## gnome-panel-control ##
 
@@ -383,14 +386,28 @@ pubinclude_HEADERS = \
 	render/mask.h \
 	render/render.h \
 	render/theme.h \
-	parser/parse.h
+	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
 
 nodist_pkgconfig_DATA = \
-	render/obrender-3.0.pc \
-	parser/obparser-3.0.pc
+	render/obrender-4.0.pc \
+	obt/obt-4.0.pc
 
 ## data ##
 
@@ -449,8 +466,8 @@ dist_noinst_DATA = \
 	doc/openbox-gnome-session.1.in \
 	doc/openbox-kde-session.1.sgml \
 	doc/openbox-kde-session.1.in \
-	render/obrender-3.0.pc.in \
-	parser/obparser-3.0.pc.in \
+	render/obrender-4.0.pc.in \
+	obt/obt-4.0.pc.in \
 	tools/themeupdate/themeupdate.py \
 	tests/hideshow.py \
 	tests/Makefile \
@@ -506,7 +523,7 @@ CLEANFILES = \
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc
 
 distclean-local:
-	for d in . m4 po render; do \
+	for d in . m4 po render parser obt openbox; do \
 		for p in core core.* gmon.out *\~ *.orig *.rej .\#*; do \
 			rm -f "$$d/$$p"; \
 		done \