Merge branch 'backport' into work

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f13d52ac2cd1a5964b342887d3c2deb020a3e7b6..c60389af5a3a760a642451123d60bf1a537b6895 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -244,7 +244,6 @@ openbox_openbox_SOURCES = \
        openbox/grab.h \
        openbox/group.c \
        openbox/group.h \
-       openbox/imageload.h \
        openbox/keyboard.c \
        openbox/keyboard.h \
        openbox/keytree.c \
@@ -284,9 +283,6 @@ openbox_openbox_SOURCES = \
        openbox/window.c \
        openbox/window.h
 
-if USE_IMLIB2
-    openbox_openbox_SOURCES += openbox/imageload.c
-endif
 
 ## gnome-panel-control ##
 
@@ -546,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