Merge branch 'backport' into work

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0bcb8b28e10013d80b84d3164960eef3ddf72f8c..9617a1ca4738acd7b01275934662162052f2920f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -129,8 +129,8 @@ obt_libobt_la_SOURCES = \
        obt/keyboard.c \
        obt/mainloop.h \
        obt/mainloop.c \
-       obt/parse.h \
-       obt/parse.c \
+       obt/xml.h \
+       obt/xml.c \
        obt/paths.h \
        obt/paths.c \
        obt/prop.h \
@@ -423,7 +423,7 @@ obtpubinclude_HEADERS = \
        obt/display.h \
        obt/keyboard.h \
        obt/mainloop.h \
-       obt/parse.h \
+       obt/xml.h \
        obt/paths.h \
        obt/prop.h \
        obt/util.h \
@@ -501,6 +501,8 @@ dist_noinst_DATA = \
        doc/openbox-gnome-session.1.in \
        doc/openbox-kde-session.1.sgml \
        doc/openbox-kde-session.1.in \
+       doc/obxprop.1.sgml \
+       doc/obxprop.1.in \
        obrender/version.h.in \
        obrender/obrender-3.5.pc.in \
        obt/obt-3.5.pc.in \