remove old themes

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7545278bdeafe99841c6932ab7aa001a10c0a9fb..40bfbf0c0e3570c00d1a450a769edfbc52f1fdd1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 INCLUDES = -I.
 
-noinst_PROGRAMS = \
+check_PROGRAMS = \
        render/rendertest
 
 lib_LTLIBRARIES = \
@@ -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,10 +52,18 @@ render_libobrender_la_CPPFLAGS = \
        $(XFT_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(XML_CFLAGS) \
+       $(PANGO_CFLAGS) \
        -DG_LOG_DOMAIN=\"ObRender\" \
        -DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LDFLAGS = \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+render_libobrender_la_LIBADD = \
+       parser/libobparser.la \
+       $(X_LIBS) \
+       $(XFT_LIBS) \
+       $(PANGO_LIBS) \
+       $(GLIB_LIBS) \
+       $(XML_LIBS)
 render_libobrender_la_SOURCES = \
        gettext.h \
        render/color.h \
@@ -87,6 +96,9 @@ parser_libobparser_la_CPPFLAGS = \
        -DCONFIGDIR=\"$(configdir)\"
 parser_libobparser_la_LDFLAGS = \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+parser_libobparser_la_LIBADD = \
+       $(GLIB_LIBS) \
+       $(XML_LIBS) 
 parser_libobparser_la_SOURCES = \
        parser/parse.h \
        parser/parse.c
@@ -106,11 +118,9 @@ openbox_openbox_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
        $(SM_LIBS) \
-       $(XFT_LIBS) \
        $(XINERAMA_LIBS) \
        $(XKB_LIBS) \
        $(XRANDR_LIBS) \
-       $(VIDMODE_LIBS) \
        $(XSHAPE_LIBS) \
        $(GLIB_LIBS) \
        $(X_LIBS) \
@@ -258,6 +268,13 @@ dist_thebear_theme_DATA = \
 ## public headers ##
 
 pubinclude_HEADERS = \
+       render/color.h \
+       render/font.h \
+       render/geom.h \
+       render/gradient.h \
+       render/image.h \
+       render/instance.h \
+       render/mask.h \
        render/render.h \
        render/theme.h \
        parser/parse.h