X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=051be7d76101e3483e4dfbfd144ca7dba0dafffc;hb=4c7cc1cfa64bf5722f059eae0528d510c2ae636f;hp=a03e3a3d3d34e8e44ea9ecb5390f1fef2c306396;hpb=c15da849dd28565aa8ce19569ec1280961eb605d;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index a03e3a3d..051be7d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,6 +31,9 @@ bin_PROGRAMS = \
 	openbox/openbox \
 	tools/gnome-panel-control/gnome-panel-control
 
+bin_SCRIPTS = \
+	tools/xdg-autostart/xdg-autostart
+
 nodist_bin_SCRIPTS = \
 	data/xsession/openbox-session \
 	data/xsession/openbox-gnome-session \
@@ -82,6 +85,8 @@ render_libobrender_la_SOURCES = \
 	render/icon.h \
 	render/image.h \
 	render/image.c \
+	render/imagecache.h \
+	render/imagecache.c \
 	render/instance.h \
 	render/instance.c \
 	render/mask.h \
@@ -118,9 +123,6 @@ openbox_openbox_CPPFLAGS = \
 	$(XRANDR_CFLAGS) \
 	$(XSHAPE_CFLAGS) \
 	$(XSYNC_CFLAGS) \
-	$(XRENDER_CFLAGS) \
-	$(XDAMAGE_CFLAGS) \
-	$(XCOMPOSITE_CFLAGS) \
 	$(X_CFLAGS) \
 	$(XCURSOR_CFLAGS) \
 	$(SM_CFLAGS) \
@@ -140,9 +142,6 @@ openbox_openbox_LDADD = \
 	$(XSHAPE_LIBS) \
 	$(XSYNC_LIBS) \
 	$(GLIB_LIBS) \
-	$(XRENDER_LIBS) \
-	$(XDAMAGE_LIBS) \
-	$(XCOMPOSITE_LIBS) \
 	$(X_LIBS) \
 	$(XCURSOR_LIBS) \
 	$(LIBSN_LIBS) \
@@ -164,25 +163,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/movetofromedge.c \
+	openbox/actions/moveresizeto.c \
+	openbox/actions/movetoedge.c \
 	openbox/actions/omnipresent.c \
 	openbox/actions/raise.c \
 	openbox/actions/raiselower.c \
@@ -192,6 +189,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 \
@@ -203,8 +201,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 \
@@ -252,14 +248,16 @@ 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/prompt.c \
+	openbox/prompt.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 \
@@ -307,6 +305,10 @@ clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
 dist_clearlooks_theme_DATA= \
 	themes/Clearlooks/openbox-3/themerc
 
+clearlooks34_themedir = $(themedir)/Clearlooks/openbox-3
+dist_clearlooks34_theme_DATA= \
+	themes/Clearlooks-3.4/openbox-3/themerc
+
 clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
 dist_clearlooksolive_theme_DATA= \
 	themes/Clearlooks-Olive/openbox-3/themerc
@@ -491,17 +493,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