some fixes for the debian package

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 553fcb923914bf5dd950459482f797678b80fcfc..6011e04c46653d1028d047cc864a5006cd942d2f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,7 @@ noinst_PROGRAMS = \
 
 render_rendertest_CPPFLAGS = \
        $(PANGO_CFLAGS) \
+       $(XFT_CFLAGS) \
        $(GLIB_CFLAGS) \
        -DG_LOG_DOMAIN=\"RenderTest\"
 render_rendertest_LDADD = \
@@ -49,6 +50,7 @@ render_rendertest_LDADD = \
        render/libobrender.la \
        $(GLIB_LIBS) \
        $(PANGO_LIBS) \
+       $(XFT_LIBS) \
        $(XML_LIBS) \
        $(X_LIBS)
 render_rendertest_SOURCES = render/test.c
@@ -58,6 +60,7 @@ render_libobrender_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(XML_CFLAGS) \
        $(PANGO_CFLAGS) \
+       $(XFT_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LDFLAGS = \
@@ -66,6 +69,7 @@ render_libobrender_la_LIBADD = \
        parser/libobparser.la \
        $(X_LIBS) \
        $(PANGO_LIBS) \
+       $(XFT_LIBS) \
        $(GLIB_LIBS) \
        $(XML_LIBS)
 render_libobrender_la_SOURCES = \
@@ -365,7 +369,6 @@ edit = $(SED) \
 data/xsession/openbox-gnome-session: Makefile data \
                $(srcdir)/data/xsession/openbox-gnome-session.in
        @echo make: creating $@
-       @rm -f $@
        @mkdir data 2>/dev/null || true
        @mkdir data/xsession 2>/dev/null || true
        @$(edit) $(srcdir)/data/xsession/openbox-gnome-session.in >$@
@@ -374,7 +377,6 @@ data/xsession/openbox-gnome-session: Makefile data \
 data/xsession/openbox-kde-session: Makefile data \
                $(srcdir)/data/xsession/openbox-kde-session.in
        @echo make: creating $@
-       @rm -f $@
        @mkdir data 2>/dev/null || true
        @mkdir data/xsession 2>/dev/null || true
        @$(edit) $(srcdir)/data/xsession/openbox-kde-session.in >$@
@@ -391,6 +393,19 @@ dist_xsessions_DATA = \
        data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
+       debian/changelog.in \
+       debian/compat \
+       debian/control \
+       debian/copyright \
+       debian/menu.ex \
+       debian/openbox-default.ex \
+       debian/openbox.doc-base.EX \
+       debian/postinst.ex \
+       debian/postrm.ex \
+       debian/preinst.ex \
+       debian/prerm.ex \
+       debian/rules \
+       debian/watch.ex \
        version.h.in \
        data/rc.xsd \
        data/menu.xsd \