patch to fix some xft linking

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2b578b9b9d71df79a663a61031eb5c9ea89a96ba..fd7c78943c333301d0887af274f98817548675fd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,8 @@ render_rendertest_LDADD = \
        render/libobrender.la \
        $(XFT_LIBS) \
        $(GLIB_LIBS) \
-       $(XML_LIBS)
+       $(XML_LIBS) \
+       $(X_LIBS)
 render_rendertest_SOURCES = render/test.c
 
 render_libobrender_la_CPPFLAGS = \
@@ -52,10 +53,13 @@ render_libobrender_la_CPPFLAGS = \
        $(XML_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
-render_libobrender_la_LIBADD = \
-       $(X_LIBS)
 render_libobrender_la_LDFLAGS = \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+render_libobrender_la_LIBADD = \
+       $(X_LIBS) \
+       $(XFT_LIBS) \
+       $(GLIB_LIBS) \
+       $(XML_LIBS) 
 render_libobrender_la_SOURCES = \
        gettext.h \
        render/color.h \
@@ -114,6 +118,7 @@ openbox_openbox_LDADD = \
        $(VIDMODE_LIBS) \
        $(XSHAPE_LIBS) \
        $(GLIB_LIBS) \
+       $(X_LIBS) \
        $(LIBSN_LIBS) \
        $(XML_LIBS) \
        $(EFENCE_LIBS) \
@@ -262,6 +267,9 @@ pubinclude_HEADERS = \
        render/theme.h \
        parser/parse.h
 
+nodist_pubinclude_HEADERS = \
+       version.h
+
 nodist_pkgconfig_DATA = \
        render/obrender-3.0.pc \
        parser/obparser-3.0.pc
@@ -305,6 +313,7 @@ dist_desktopfiles_DATA = \
        data/openbox.desktop
 
 dist_noinst_DATA = \
+       version.h.in \
        data/rc.xml.in \
        data/menu.xml.in \
        render/obrender-3.0.pc.in \
@@ -314,6 +323,7 @@ EXTRA_DIST = \
        config.rpath \
        mkinstalldirs \
        CHANGELOG \
+       COMPLIANCE \
        README \
        COPYING \
        AUTHORS