update openbox to use the current parser interface in libobt

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 389042fb01bfb1ecbd76bd052ce15efea85daa5c..ed68b185f1292de65e8df0a13397d94f4830e1ac 100644 (file)
--- 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) \
@@ -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,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 $(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 = \
@@ -119,24 +100,33 @@ obt_libobt_la_CPPFLAGS = \
        $(XSHAPE_CFLAGS) \
        $(XSYNC_CFLAGS) \
        $(GLIB_CFLAGS) \
+       $(XML_CFLAGS) \
        -DG_LOG_DOMAIN=\"Obt\" \
        -DLOCALEDIR=\"$(localedir)\" \
        -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)
+       $(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/prop.h \
+       obt/prop.c \
        obt/util.h
 
 ## openbox ##
@@ -164,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 = \
@@ -251,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 \
@@ -266,8 +253,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 \
@@ -393,17 +378,23 @@ 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 = \
        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 ##
@@ -463,8 +454,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 \