Link libraries directly to compile on some systems (debian).

[dana/openbox.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f57a770..f59d3e7 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
@@ -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,6 +471,7 @@ 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)!'