move stuff around some more

[chaz/openbox] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5a42da0eab6fe5999336f40566d027d16875daf4..7e212816bd83d13ad889759c25d828b3555cca13 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,10 +58,12 @@ render_libobrender_la_CPPFLAGS = \
 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) 
+       $(XML_LIBS)
 render_libobrender_la_SOURCES = \
        gettext.h \
        render/color.h \
@@ -94,7 +96,7 @@ parser_libobparser_la_CPPFLAGS = \
        -DCONFIGDIR=\"$(configdir)\"
 parser_libobparser_la_LDFLAGS = \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-render_libobparser_la_LIBADD = \
+parser_libobparser_la_LIBADD = \
        $(GLIB_LIBS) \
        $(XML_LIBS) 
 parser_libobparser_la_SOURCES = \
@@ -116,14 +118,12 @@ 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) \
-       $(PANGO_LIBS) \
        $(X_LIBS) \
        $(LIBSN_LIBS) \
        $(XML_LIBS) \
@@ -202,7 +202,9 @@ openbox_openbox_SOURCES = \
        openbox/window.c \
        openbox/window.h \
        openbox/xerror.c \
-       openbox/xerror.h
+       openbox/xerror.h \
+       openbox/per_app_settings.c \
+       openbox/per_app_settings.h
 
 
 ## kdetrayproxy ##