adding trunk

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 523d73a9b7ae2f79ddca56eb39a16fb7fe62db74..27114f80349e186222dadb39250a41c093ab69e0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,9 +118,6 @@ openbox_openbox_CPPFLAGS = \
        $(XRANDR_CFLAGS) \
        $(XSHAPE_CFLAGS) \
        $(XSYNC_CFLAGS) \
-       $(XRENDER_CFLAGS) \
-       $(XDAMAGE_CFLAGS) \
-       $(XCOMPOSITE_CFLAGS) \
        $(X_CFLAGS) \
        $(XCURSOR_CFLAGS) \
        $(SM_CFLAGS) \
@@ -140,9 +137,6 @@ openbox_openbox_LDADD = \
        $(XSHAPE_LIBS) \
        $(XSYNC_LIBS) \
        $(GLIB_LIBS) \
-       $(XRENDER_LIBS) \
-       $(XDAMAGE_LIBS) \
-       $(XCOMPOSITE_LIBS) \
        $(X_LIBS) \
        $(XCURSOR_LIBS) \
        $(LIBSN_LIBS) \
@@ -183,8 +177,8 @@ openbox_openbox_SOURCES = \
        openbox/actions/menu.c \
        openbox/actions/move.c \
        openbox/actions/moverelative.c \
-       openbox/actions/moveto.c \
-       openbox/actions/movetofromedge.c \
+       openbox/actions/moveresizeto.c \
+       openbox/actions/movetoedge.c \
        openbox/actions/omnipresent.c \
        openbox/actions/raise.c \
        openbox/actions/raiselower.c \
@@ -205,8 +199,6 @@ openbox_openbox_SOURCES = \
        openbox/client_list_combined_menu.h \
        openbox/client_menu.c \
        openbox/client_menu.h \
-       openbox/composite.c \
-       openbox/composite.h \
        openbox/config.c \
        openbox/config.h \
        openbox/debug.c \