X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=32c65db505b2230689df08a376d34786ffcb969c;hb=2338bf0aa35df0ed33e52a2b2eb9ef52ccd19a2c;hp=246abede9a430c7f057940ce402b22c42131a050;hpb=fd77a0a7b3f892925f203287b8b46c6ec9be94ea;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 246abede..32c65db5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,13 +41,18 @@ nodist_bin_SCRIPTS = \
 	data/xsession/openbox-kde-session
 
 dist_rc_SCRIPTS = \
-	data/environment \
+	data/environment
+
+nodist_rc_SCRIPTS = \
 	data/autostart/autostart
 
 dist_libexec_SCRIPTS = \
 	data/autostart/openbox-xdg-autostart \
 	data/autostart/openbox-autostart
 
+nodist_libexec_SCRIPTS = \
+	data/autostart/openbox-autostart
+
 
 ## obrender ##
 
@@ -144,7 +149,11 @@ obt_libobt_la_SOURCES = \
 	obt/paths.c \
 	obt/prop.h \
 	obt/prop.c \
+	obt/signal.h \
+	obt/signal.c \
 	obt/util.h \
+	obt/watch.h \
+	obt/watch.c \
 	obt/xqueue.h \
 	obt/xqueue.c
 
@@ -186,6 +195,7 @@ openbox_openbox_SOURCES = \
 	openbox/actions/debug.c \
 	openbox/actions/decorations.c \
 	openbox/actions/desktop.c \
+	openbox/actions/dock.c \
 	openbox/actions/dockautohide.c \
 	openbox/actions/directionalwindows.c \
 	openbox/actions/execute.c \
@@ -342,7 +352,7 @@ clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
 dist_clearlooks_theme_DATA= \
 	themes/Clearlooks/openbox-3/themerc
 
-clearlooks34_themedir = $(themedir)/Clearlooks/openbox-3
+clearlooks34_themedir = $(themedir)/Clearlooks-3.4/openbox-3
 dist_clearlooks34_theme_DATA= \
 	themes/Clearlooks-3.4/openbox-3/themerc
 
@@ -436,8 +446,10 @@ obtpubinclude_HEADERS = \
 	obt/xml.h \
 	obt/paths.h \
 	obt/prop.h \
+	obt/signal.h \
 	obt/util.h \
 	obt/version.h \
+	obt/watch.h \
 	obt/xqueue.h
 
 nodist_pkgconfig_DATA = \
@@ -464,11 +476,15 @@ edit = $(SED) \
 
 data/autostart/autostart: $(srcdir)/data/autostart/autostart.in Makefile
 	@echo make: creating $@
-	@$(edit) $< >$@
+	@test -d $(shell dirname $(builddir)/$@) || \
+	  mkdir $(shell dirname $(builddir)/$@)
+	@$(edit) $< >$(builddir)/$@
 
 data/autostart/openbox-autostart: $(srcdir)/data/autostart/openbox-autostart.in Makefile
 	@echo make: creating $@
-	@$(edit) $< >$@
+	@test -d $(shell dirname $(builddir)/$@) || \
+	  mkdir $(shell dirname $(builddir)/$@)
+	@$(edit) $< >$(builddir)/$@
 
 %.desktop: %.desktop.in Makefile
 	@echo make: creating $@
@@ -560,16 +576,11 @@ EXTRA_DIST = \
 # make clean doesn't delete these for some reason, even though they are
 # built by make
 CLEANFILES = \
-	doc/openbox.1 \
-	doc/openbox-session.1 \
-	doc/openbox-gnome-session.1 \
-	doc/openbox-kde-session.1 \
-	data/xsession/openbox-session \
-	data/xsession/openbox-gnome-session \
-	data/xsession/openbox-kde-session \
-	data/xsession/openbox.desktop \
-	data/xsession/openbox-gnome.desktop \
-	data/xsession/openbox-kde.desktop
+	$(nodist_man_MANS) \
+	$(nodist_bin_SCRIPTS) \
+	$(nodist_xsessions_DATA) \
+	$(nodist_rc_SCRIPTS) \
+	$(nodist_libexec_SCRIPTS)
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc