Merge branch 'backport' into work

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6e8cb232a54dd0c78c3325c2aa5a0231fa50cc8f..9027759645da35fb110ab6437ae9ca5dfb3dc07a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,8 +26,8 @@ check_PROGRAMS = \
        render/rendertest
 
 lib_LTLIBRARIES = \
-       render/libobrender.la \
-       obt/libobt.la
+       obt/libobt.la \
+       render/libobrender.la
 
 bin_PROGRAMS = \
        openbox/openbox \
@@ -242,6 +242,8 @@ openbox_openbox_SOURCES = \
        openbox/grab.h \
        openbox/group.c \
        openbox/group.h \
+       openbox/hooks.c \
+       openbox/hooks.h \
        openbox/keyboard.c \
        openbox/keyboard.h \
        openbox/keytree.c \