Merge branch 'backport' into work

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bc0ff88a2ff2c5110c3501681ce134ca44d69acf..c72a40b3d2c3e63d022470e419faef34ed3c33e5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -187,7 +187,6 @@ openbox_openbox_SOURCES = \
        openbox/actions/if.c \
        openbox/actions/kill.c \
        openbox/actions/layer.c \
-       openbox/actions/session.c \
        openbox/actions/lower.c \
        openbox/actions/maximize.c \
        openbox/actions/move.c \
@@ -202,6 +201,7 @@ openbox_openbox_SOURCES = \
        openbox/actions/resizerelative.c \
        openbox/actions/restart.c \
        openbox/actions/shade.c \
+       openbox/actions/shadelowerraise.c \
        openbox/actions/showdesktop.c \
        openbox/actions/showmenu.c \
        openbox/actions/unfocus.c \
@@ -240,8 +240,6 @@ 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 \