Merge branch 'm4/master'

[mikachu/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8cdb126..c62a594 100644 (file)
--- 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
@@ -154,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
 
@@ -175,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) \
@@ -326,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 = \
@@ -451,7 +452,6 @@ obtpubinclude_HEADERS = \
        obt/signal.h \
        obt/util.h \
        obt/version.h \
-       obt/watch.h \
        obt/xqueue.h
 
 nodist_pkgconfig_DATA = \
@@ -473,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 $@