X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=7e212816bd83d13ad889759c25d828b3555cca13;hb=3c3415d87b3ab0f5b141fa4b122d80ed23616dfd;hp=e111dab58b015171f5424a0f0970820656d56948;hpb=ce2643f55bafecd84bb2fd6d6e72537f2921545c;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index e111dab5..7e212816 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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,7 +118,6 @@ openbox_openbox_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
 	$(SM_LIBS) \
-	$(XFT_LIBS) \
 	$(XINERAMA_LIBS) \
 	$(XKB_LIBS) \
 	$(XRANDR_LIBS) \
@@ -191,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 ##
@@ -262,6 +275,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 +321,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 \