Merge branch 'master' of git://orodu.net/openbox

[mikachu/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index baa62b3..07c7ce6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -148,8 +148,46 @@ openbox_openbox_LDADD = \
 openbox_openbox_LDFLAGS = -export-dynamic
 openbox_openbox_SOURCES = \
        gettext.h \
-       openbox/action.c \
-       openbox/action.h \
+       openbox/actions/all.c \
+       openbox/actions/all.h \
+       openbox/actions/addremovedesktop.c \
+       openbox/actions/breakchroot.c \
+       openbox/actions/close.c \
+       openbox/actions/cyclewindows.c \
+       openbox/actions/debug.c \
+       openbox/actions/decorations.c \
+       openbox/actions/desktop.c \
+       openbox/actions/dockautohide.c \
+       openbox/actions/directionalwindows.c \
+       openbox/actions/execute.c \
+       openbox/actions/exit.c \
+       openbox/actions/focus.c \
+       openbox/actions/focustobottom.c \
+       openbox/actions/fullscreen.c \
+       openbox/actions/growtoedge.c \
+       openbox/actions/iconify.c \
+       openbox/actions/if.c \
+       openbox/actions/kill.c \
+       openbox/actions/layer.c \
+       openbox/actions/lower.c \
+       openbox/actions/maximize.c \
+       openbox/actions/move.c \
+       openbox/actions/moverelative.c \
+       openbox/actions/moveresizeto.c \
+       openbox/actions/movetoedge.c \
+       openbox/actions/omnipresent.c \
+       openbox/actions/raise.c \
+       openbox/actions/raiselower.c \
+       openbox/actions/reconfigure.c \
+       openbox/actions/resize.c \
+       openbox/actions/resizerelative.c \
+       openbox/actions/restart.c \
+       openbox/actions/shade.c \
+       openbox/actions/showdesktop.c \
+       openbox/actions/showmenu.c \
+       openbox/actions/unfocus.c \
+       openbox/actions.c \
+       openbox/actions.h \
        openbox/client.c \
        openbox/client.h \
        openbox/client_list_menu.c \
@@ -313,6 +351,14 @@ orang_themedir = $(themedir)/Orang/openbox-3
 dist_orang_theme_DATA= \
        themes/Orang/openbox-3/themerc
 
+onyx_themedir = $(themedir)/Onyx/openbox-3
+dist_onyx_theme_DATA= \
+       themes/Onyx/openbox-3/themerc
+
+onyxcitrus_themedir = $(themedir)/Onyx-Citrus/openbox-3
+dist_onyxcitrus_theme_DATA= \
+       themes/Onyx-Citrus/openbox-3/themerc
+
 syscrash_themedir = $(themedir)/Syscrash/openbox-3
 dist_syscrash_theme_DATA= \
        themes/Syscrash/openbox-3/max_disabled.xbm \
@@ -436,15 +482,6 @@ nodist_man_MANS = \
        doc/openbox-kde-session.1
 
 EXTRA_DIST = \
-       debian/changelog.in \
-       debian/compat \
-       debian/conffiles \
-       debian/control \
-       debian/copyright \
-       debian/menu \
-       debian/postinst \
-       debian/postrm \
-       debian/rules \
        config.rpath \
        mkinstalldirs