X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=f57a770351b35c5ee3440392741d7710421de505;hb=a8dbf2e74ea967158db754e383a88c84c331f97c;hp=32c65db505b2230689df08a376d34786ffcb969c;hpb=27ae9d65c838478f1c7e07ec52a6848600865bf1;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 32c65db5..f57a7703 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -152,8 +152,6 @@ obt_libobt_la_SOURCES = \
 	obt/signal.h \
 	obt/signal.c \
 	obt/util.h \
-	obt/watch.h \
-	obt/watch.c \
 	obt/xqueue.h \
 	obt/xqueue.c
 
@@ -449,7 +447,6 @@ obtpubinclude_HEADERS = \
 	obt/signal.h \
 	obt/util.h \
 	obt/version.h \
-	obt/watch.h \
 	obt/xqueue.h
 
 nodist_pkgconfig_DATA = \
@@ -474,17 +471,17 @@ edit = $(SED) \
 	-e 's!@libexecdir\@!$(libexecdir)!' \
 	-e 's!@bindir\@!$(bindir)!'
 
-data/autostart/autostart: $(srcdir)/data/autostart/autostart.in Makefile
+data/autostart/autostart: $(top_srcdir)/data/autostart/autostart.in Makefile
 	@echo make: creating $@
-	@test -d $(shell dirname $(builddir)/$@) || \
-	  mkdir $(shell dirname $(builddir)/$@)
-	@$(edit) $< >$(builddir)/$@
+	@test -d $(shell dirname $(top_builddir)/$@) || \
+	  mkdir $(shell dirname $(top_builddir)/$@)
+	@$(edit) $< >$(top_builddir)/$@
 
-data/autostart/openbox-autostart: $(srcdir)/data/autostart/openbox-autostart.in Makefile
+data/autostart/openbox-autostart: $(top_srcdir)/data/autostart/openbox-autostart.in Makefile
 	@echo make: creating $@
-	@test -d $(shell dirname $(builddir)/$@) || \
-	  mkdir $(shell dirname $(builddir)/$@)
-	@$(edit) $< >$(builddir)/$@
+	@test -d $(shell dirname $(top_builddir)/$@) || \
+	  mkdir $(shell dirname $(top_builddir)/$@)
+	@$(edit) $< >$(top_builddir)/$@
 
 %.desktop: %.desktop.in Makefile
 	@echo make: creating $@