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

diff --git a/Makefile.am b/Makefile.am
index 32c65db5..c62a5944 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,8 +47,7 @@ nodist_rc_SCRIPTS = \
 	data/autostart/autostart
 
 dist_libexec_SCRIPTS = \
-	data/autostart/openbox-xdg-autostart \
-	data/autostart/openbox-autostart
+	data/autostart/openbox-xdg-autostart
 
 nodist_libexec_SCRIPTS = \
 	data/autostart/openbox-autostart
@@ -87,6 +86,8 @@ obrender_libobrender_la_LIBADD = \
 	$(XML_LIBS)
 obrender_libobrender_la_SOURCES = \
 	gettext.h \
+	obrender/button.h \
+	obrender/button.c \
 	obrender/color.h \
 	obrender/color.c \
 	obrender/font.h \
@@ -152,8 +153,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
 
@@ -173,6 +172,8 @@ openbox_openbox_CPPFLAGS = \
 	-DCONFIGDIR=\"$(configdir)\" \
 	-DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
+	$(XINERAMA_LIBS) \
+	$(XRANDR_LIBS) \
 	$(SM_LIBS) \
 	$(GLIB_LIBS) \
 	$(X_LIBS) \
@@ -324,9 +325,11 @@ tools_obxprop_obxprop_SOURCES = \
 ## gdm-control ##
 
 tools_gdm_control_gdm_control_CPPFLAGS = \
+	$(XAUTH_CFLAGS) \
 	$(X_CFLAGS) \
 	$(GLIB_CFLAGS)
 tools_gdm_control_gdm_control_LDADD = \
+	$(XAUTH_LIBS) \
 	$(X_LIBS) \
 	$(GLIB_LIBS)
 tools_gdm_control_gdm_control_SOURCES = \
@@ -449,7 +452,6 @@ obtpubinclude_HEADERS = \
 	obt/signal.h \
 	obt/util.h \
 	obt/version.h \
-	obt/watch.h \
 	obt/xqueue.h
 
 nodist_pkgconfig_DATA = \
@@ -471,20 +473,21 @@ dist_rc_DATA = \
 edit = $(SED) \
 	-e 's!@version\@!$(VERSION)!' \
 	-e 's!@configdir\@!$(configdir)!' \
+	-e 's!@rcdir\@!$(rcdir)!' \
 	-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 $@