add prop.[ch] to the libobt, but they are not used yet. add a global obt_display...

[dana/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b547eaa..76f8454 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,7 @@ 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 \
        $(X_LIBS) \
@@ -102,7 +102,7 @@ parser_libobparser_la_CPPFLAGS = \
        -DDATADIR=\"$(datadir)\" \
        -DCONFIGDIR=\"$(configdir)\"
 parser_libobparser_la_LDFLAGS = \
-       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+       -version-info $(RR_CURRENT):$(RR_REVISION):$(RR_AGE)
 parser_libobparser_la_LIBADD = \
        $(GLIB_LIBS) \
        $(XML_LIBS) 
@@ -113,34 +113,38 @@ parser_libobparser_la_SOURCES = \
 ## obt ##
 
 obt_libobt_la_CPPFLAGS = \
+       $(XINERAMA_CFLAGS) \
+       $(XKB_CFLAGS) \
+       $(XRANDR_CFLAGS) \
+       $(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 = \
-       $(GLIB_LIBS) \
-       $(XML_LIBS)
+       $(XINERAMA_LIBS) \
+       $(XKB_LIBS) \
+       $(XRANDR_LIBS) \
+       $(XSHAPE_LIBS) \
+       $(XSYNC_LIBS) \
+       $(GLIB_LIBS)
 obt_libobt_la_SOURCES = \
-       obt/obt.h \
        obt/display.h \
        obt/display.c \
        obt/mainloop.h \
        obt/mainloop.c \
+       obt/prop.h \
+       obt/prop.c \
        obt/util.h
 
 ## openbox ##
 
 openbox_openbox_CPPFLAGS = \
        $(SM_CFLAGS) \
-       $(XINERAMA_CFLAGS) \
-       $(XKB_CFLAGS) \
-       $(XRANDR_CFLAGS) \
-       $(XSHAPE_CFLAGS) \
-       $(XSYNC_CFLAGS) \
        $(X_CFLAGS) \
        $(XCURSOR_CFLAGS) \
        $(SM_CFLAGS) \
@@ -154,11 +158,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) \
@@ -228,8 +227,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 \
@@ -286,10 +283,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 ##
 
@@ -402,7 +396,6 @@ pubinclude_HEADERS = \
        render/render.h \
        render/theme.h \
        parser/parse.h \
-       obt/obt.h \
        obt/display.h \
        obt/mainloop.h \
        obt/util.h
@@ -411,8 +404,8 @@ nodist_pubinclude_HEADERS = \
        version.h
 
 nodist_pkgconfig_DATA = \
-       render/obrender-3.0.pc \
-       parser/obparser-3.0.pc \
+       render/obrender-4.0.pc \
+       parser/obparser-4.0.pc \
        obt/obt-4.0.pc
 
 ## data ##
@@ -472,8 +465,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 \
+       parser/obparser-4.0.pc.in \
        obt/obt-4.0.pc.in \
        tools/themeupdate/themeupdate.py \
        tests/hideshow.py \