X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=c60389af5a3a760a642451123d60bf1a537b6895;hb=6014a41760a107d817422aa5412ccf0ce3fc6e92;hp=0bcb8b28e10013d80b84d3164960eef3ddf72f8c;hpb=7aae8cc5262c1b36e3196845d62489b76af9063f;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 0bcb8b28..c60389af 100644
--- 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 \
@@ -150,6 +150,7 @@ openbox_openbox_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(LIBSN_CFLAGS) \
 	$(XML_CFLAGS) \
+	$(IMLIB2_CFLAGS) \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DCONFIGDIR=\"$(configdir)\" \
@@ -163,6 +164,7 @@ openbox_openbox_LDADD = \
 	$(XML_LIBS) \
 	$(EFENCE_LIBS) \
 	$(LIBINTL) \
+	$(IMLIB2_LIBS) \
 	obrender/libobrender.la \
 	obt/libobt.la
 openbox_openbox_LDFLAGS = -export-dynamic
@@ -281,6 +283,7 @@ openbox_openbox_SOURCES = \
 	openbox/window.c \
 	openbox/window.h
 
+
 ## gnome-panel-control ##
 
 tools_gnome_panel_control_gnome_panel_control_CPPFLAGS = \
@@ -423,7 +426,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 +504,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 \
@@ -537,7 +542,8 @@ nodist_man_MANS = \
 	doc/openbox.1 \
 	doc/openbox-session.1 \
 	doc/openbox-gnome-session.1 \
-	doc/openbox-kde-session.1
+	doc/openbox-kde-session.1 \
+	doc/obxprop.1
 
 EXTRA_DIST = \
 	config.rpath