X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=ed68b185f1292de65e8df0a13397d94f4830e1ac;hb=fdabb69f4f25596df972caa76c85c2aeba26226e;hp=770f587e30dae77483abfa00d33eb2d18cd2e9ef;hpb=1aac72bc4cfffdd816347d305624b15d0ae2112e;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 770f587e..ed68b185 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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) \
@@ -65,7 +64,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 +91,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 +100,7 @@ obt_libobt_la_CPPFLAGS = \
 	$(XSHAPE_CFLAGS) \
 	$(XSYNC_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(XML_CFLAGS) \
 	-DG_LOG_DOMAIN=\"Obt\" \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DDATADIR=\"$(datadir)\" \
@@ -131,7 +113,8 @@ 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 \
@@ -140,6 +123,8 @@ obt_libobt_la_SOURCES = \
 	obt/keyboard.c \
 	obt/mainloop.h \
 	obt/mainloop.c \
+	obt/parse.h \
+	obt/parse.c \
 	obt/prop.h \
 	obt/prop.c \
 	obt/util.h
@@ -169,7 +154,6 @@ openbox_openbox_LDADD = \
 	$(EFENCE_LIBS) \
 	$(LIBINTL) \
 	render/libobrender.la \
-	parser/libobparser.la \
 	obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
 openbox_openbox_SOURCES = \
@@ -256,8 +240,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 \
@@ -396,9 +378,16 @@ 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/prop.h \
+	obt/prop.c \
 	obt/util.h
 
 nodist_pubinclude_HEADERS = \
@@ -406,7 +395,6 @@ nodist_pubinclude_HEADERS = \
 
 nodist_pkgconfig_DATA = \
 	render/obrender-4.0.pc \
-	parser/obparser-4.0.pc \
 	obt/obt-4.0.pc
 
 ## data ##
@@ -467,7 +455,6 @@ dist_noinst_DATA = \
 	doc/openbox-kde-session.1.sgml \
 	doc/openbox-kde-session.1.in \
 	render/obrender-4.0.pc.in \
-	parser/obparser-4.0.pc.in \
 	obt/obt-4.0.pc.in \
 	tools/themeupdate/themeupdate.py \
 	tests/hideshow.py \