X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=f59d3e7e6942f3cc1630348dcdd214f60d1257c8;hb=db2c229552132683c49c47aa946286d2b6b48360;hp=edd02fd1841c736f619e732bd8d93821da3ceb70;hpb=d3d96b572a9278cf8f3542b56e583b1744b1110f;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index edd02fd1..f59d3e7e 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
@@ -171,6 +170,8 @@ openbox_openbox_CPPFLAGS = \
 	-DCONFIGDIR=\"$(configdir)\" \
 	-DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
+	$(XINERAMA_LIBS) \
+	$(XRANDR_LIBS) \
 	$(SM_LIBS) \
 	$(GLIB_LIBS) \
 	$(X_LIBS) \
@@ -322,9 +323,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 = \
@@ -468,20 +471,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 $@