X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=714690830a1560ac136e2cd2bc0fa093b3bd6c42;hb=c885c9a676e4860a68f0bdce4b926902f6597ebb;hp=8cdb126a321874d9d7cd3984d853e863179953f0;hpb=6d30d66efb028fbafb58712aa5b71cadfeef2e32;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 8cdb126a..71469083 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,7 @@ localedir       = $(datadir)/locale
 configdir       = $(sysconfdir)/xdg
 rcdir           = $(configdir)/openbox
 xsessionsdir    = $(datadir)/xsessions
+gnomesessiondir = $(datadir)/gnome-session/sessions
 gnomewmfilesdir = $(datadir)/gnome/wm-properties
 pkgconfigdir    = $(libdir)/pkgconfig
 obtpubincludedir= $(includedir)/openbox/@OBT_VERSION@/obt
@@ -47,8 +48,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
@@ -154,8 +154,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
 
@@ -175,6 +173,8 @@ openbox_openbox_CPPFLAGS = \
 	-DCONFIGDIR=\"$(configdir)\" \
 	-DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
+	$(XINERAMA_LIBS) \
+	$(XRANDR_LIBS) \
 	$(SM_LIBS) \
 	$(GLIB_LIBS) \
 	$(X_LIBS) \
@@ -326,9 +326,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 = \
@@ -451,7 +453,6 @@ obtpubinclude_HEADERS = \
 	obt/signal.h \
 	obt/util.h \
 	obt/version.h \
-	obt/watch.h \
 	obt/xqueue.h
 
 nodist_pkgconfig_DATA = \
@@ -473,20 +474,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 $@
@@ -512,6 +514,9 @@ nodist_xsessions_DATA = \
 	data/xsession/openbox-gnome.desktop \
 	data/xsession/openbox-kde.desktop
 
+dist_gnomesession_DATA = \
+	data/xsession/openbox-gnome.session
+
 dist_noinst_DATA = \
 	data/rc.xsd \
 	data/menu.xsd \