X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=6b474a654a3bd69e29d97dc924779c2a9ab54b51;hb=3ae58f457bcdfa90b26dad4c9d192f045874ddae;hp=9a9f9d3f0c19de400c73b495f852da801253002f;hpb=ca28e08c2f47dec4e30f54c3ef64376a6246fbf9;p=chaz%2Fopenbox diff --git a/Makefile.am b/Makefile.am index 9a9f9d3f..6b474a65 100644 --- 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) \ @@ -164,23 +158,23 @@ openbox_openbox_SOURCES = \ openbox/actions/decorations.c \ openbox/actions/desktop.c \ openbox/actions/dockautohide.c \ - openbox/actions/directionalcyclewindows.c \ - openbox/actions/directionaldesktop.c \ - openbox/actions/directionaltargetwindow.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/maximizehorizontal.c \ - openbox/actions/maximizevertical.c \ - openbox/actions/menu.c \ openbox/actions/move.c \ openbox/actions/moverelative.c \ - openbox/actions/moveto.c \ + openbox/actions/moveresizeto.c \ + openbox/actions/movetoedge.c \ openbox/actions/omnipresent.c \ openbox/actions/raise.c \ openbox/actions/raiselower.c \ @@ -190,6 +184,7 @@ openbox_openbox_SOURCES = \ 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 \ @@ -201,8 +196,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 \ @@ -250,14 +243,14 @@ openbox_openbox_SOURCES = \ openbox/mwm.h \ openbox/openbox.c \ openbox/openbox.h \ + openbox/ping.c \ + openbox/ping.h \ openbox/place.c \ openbox/place.h \ openbox/popup.c \ openbox/popup.h \ openbox/prop.c \ openbox/prop.h \ - openbox/propwin.c \ - openbox/propwin.h \ openbox/resist.c \ openbox/resist.h \ openbox/screen.c \ @@ -489,17 +482,7 @@ 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 + config.rpath # make clean doesn't delete these for some reason, even though they are # built by make