None instead of TRUE/FALSE to XGrabPointer (?)

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ad1c0fcde4044d4a93f1bb5bb6c308e222fc939c..7545278bdeafe99841c6932ab7aa001a10c0a9fb 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,8 +53,6 @@ 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_SOURCES = \
@@ -114,6 +113,7 @@ openbox_openbox_LDADD = \
        $(VIDMODE_LIBS) \
        $(XSHAPE_LIBS) \
        $(GLIB_LIBS) \
+       $(X_LIBS) \
        $(LIBSN_LIBS) \
        $(XML_LIBS) \
        $(EFENCE_LIBS) \
@@ -262,6 +262,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 +308,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 \
@@ -313,6 +317,8 @@ dist_noinst_DATA = \
 EXTRA_DIST = \
        config.rpath \
        mkinstalldirs \
+       CHANGELOG \
+       COMPLIANCE \
        README \
        COPYING \
        AUTHORS