testing branching

diff --git a/Makefile.am b/Makefile.am
index 710999c7ce370baa3fa521c97df5bd7709318ad5..8d554250bedb6bea5092fb9144f38c7fec2f255c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,6 +62,7 @@ render_libobrender_la_LIBADD = \
        $(XFT_LIBS) \
        $(PANGO_LIBS) \
        $(GLIB_LIBS) \
        $(XFT_LIBS) \
        $(PANGO_LIBS) \
        $(GLIB_LIBS) \

+       $(PANGO_LIBS) \

        $(XML_LIBS) 
 render_libobrender_la_SOURCES = \
        gettext.h \
        $(XML_LIBS) 
 render_libobrender_la_SOURCES = \
        gettext.h \


@@ -130,6 +131,8 @@ openbox_openbox_LDADD = \
        $(LIBINTL) \
        render/libobrender.la \
        parser/libobparser.la
        $(LIBINTL) \
        render/libobrender.la \
        parser/libobparser.la

+#      $(XFT_LIBS) \
+#      $(PANGO_LIBS) \

 openbox_openbox_LDFLAGS = -export-dynamic
 openbox_openbox_SOURCES = \
        gettext.h \
 openbox_openbox_LDFLAGS = -export-dynamic
 openbox_openbox_SOURCES = \
        gettext.h \