Merge branches 'wip/edges', 'mikabox/crap', 'mikabox/lock', 'mikabox/maybe' and ...

[mikachu/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b438904..db80b6d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -210,6 +210,7 @@ openbox_openbox_SOURCES = \
        openbox/actions/execute.c \
        openbox/actions/exit.c \
        openbox/actions/focus.c \
+       openbox/actions/focusfallback.c \
        openbox/actions/focustobottom.c \
        openbox/actions/fullscreen.c \
        openbox/actions/growtoedge.c \
@@ -217,6 +218,7 @@ openbox_openbox_SOURCES = \
        openbox/actions/if.c \
        openbox/actions/kill.c \
        openbox/actions/layer.c \
+       openbox/actions/lock.c \
        openbox/actions/lower.c \
        openbox/actions/maximize.c \
        openbox/actions/move.c \
@@ -226,10 +228,12 @@ openbox_openbox_SOURCES = \
        openbox/actions/omnipresent.c \
        openbox/actions/raise.c \
        openbox/actions/raiselower.c \
+       openbox/actions/raisetemp.c \
        openbox/actions/reconfigure.c \
        openbox/actions/resize.c \
        openbox/actions/resizerelative.c \
        openbox/actions/restart.c \
+       openbox/actions/sendkeyevent.c \
        openbox/actions/shade.c \
        openbox/actions/shadelowerraise.c \
        openbox/actions/showdesktop.c \
@@ -251,6 +255,8 @@ openbox_openbox_SOURCES = \
        openbox/debug.h \
        openbox/dock.c \
        openbox/dock.h \
+       openbox/edges.c \
+       openbox/edges.h \
        openbox/event.c \
        openbox/event.h \
        openbox/focus.c \