X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=3025686d2b63b1088e5d07b2950c060cbef76bd9;hb=73c9a0e06b0248d430aac1c2c91f44a6a9dbac04;hp=6c2140ef1089b746661e917384fd33fc7761bfdb;hpb=a2f5a826a1ed79102cd59a9ef17724fb90afe86b;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 6c2140ef..3025686d 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,7 +24,6 @@ check_PROGRAMS = \
 	render/rendertest
 
 lib_LTLIBRARIES = \
-	parser/libobparser.la \
 	render/libobrender.la \
 	obt/libobt.la
 
@@ -45,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) \
@@ -63,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) \
@@ -92,27 +91,14 @@ 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 $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-parser_libobparser_la_LIBADD = \
-	$(GLIB_LIBS) \
-	$(XML_LIBS) 
-parser_libobparser_la_SOURCES = \
-	parser/parse.h \
-	parser/parse.c
-
 ## obt ##
 
 obt_libobt_la_CPPFLAGS = \
+	$(XINERAMA_CFLAGS) \
+	$(XKB_CFLAGS) \
+	$(XRANDR_CFLAGS) \
+	$(XSHAPE_CFLAGS) \
+	$(XSYNC_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(XML_CFLAGS) \
 	-DG_LOG_DOMAIN=\"Obt\" \
@@ -120,27 +106,37 @@ obt_libobt_la_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DCONFIGDIR=\"$(configdir)\"
 obt_libobt_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+	-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)
 obt_libobt_la_SOURCES = \
-	obt/obt.h \
 	obt/display.h \
 	obt/display.c \
+	obt/internal.h \
+	obt/keyboard.h \
+	obt/keyboard.c \
 	obt/mainloop.h \
 	obt/mainloop.c \
-	obt/util.h
+	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) \
@@ -154,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) \
@@ -167,7 +158,6 @@ openbox_openbox_LDADD = \
 	$(EFENCE_LIBS) \
 	$(LIBINTL) \
 	render/libobrender.la \
-	parser/libobparser.la \
 	obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
 openbox_openbox_SOURCES = \
@@ -228,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 \
@@ -256,8 +244,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 \
@@ -271,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 \
@@ -398,18 +382,27 @@ pubinclude_HEADERS = \
 	render/mask.h \
 	render/render.h \
 	render/theme.h \
-	parser/parse.h \
-	obt/obt.h \
 	obt/display.h \
+	obt/display.c \
+	obt/keyboard.h \
+	obt/keyboard.c \
 	obt/mainloop.h \
-	obt/util.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 ##
@@ -469,8 +462,7 @@ 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 \