the xinerama patch from john russell, modified a bit and merged the move_onmonitor...

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4dae8b98d427050203f48a493f77fc0067bc9703..030fb655900843835453bef41c97adedb1172636 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,7 @@ render_rendertest_LDADD = \
        render/libobrender.la \
        $(XFT_LIBS) \
        $(GLIB_LIBS) \
+       $(PANGO_LIBS) \
        $(XML_LIBS) \
        $(X_LIBS)
 render_rendertest_SOURCES = render/test.c
@@ -51,6 +52,7 @@ render_libobrender_la_CPPFLAGS = \
        $(XFT_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(XML_CFLAGS) \
+       $(PANGO_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LDFLAGS = \
@@ -113,6 +115,7 @@ openbox_openbox_LDADD = \
        $(VIDMODE_LIBS) \
        $(XSHAPE_LIBS) \
        $(GLIB_LIBS) \
+       $(PANGO_LIBS) \
        $(X_LIBS) \
        $(LIBSN_LIBS) \
        $(XML_LIBS) \
@@ -262,6 +265,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 +311,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 +321,7 @@ EXTRA_DIST = \
        config.rpath \
        mkinstalldirs \
        CHANGELOG \
+       COMPLIANCE \
        README \
        COPYING \
        AUTHORS