X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=798707a3c6e0c80f5b0f8b4aa2225f0417787a8a;hb=a908e04818e2d9eab3e3d8049c573e8d9ddcd0b8;hp=7286ca37b662fe3c939ec02aca54c3a3532c1dd9;hpb=13206849ea97d9572c0ea23981ee4c61df1ec702;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 7286ca37..798707a3 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 = \
+	$(X_LIBS) \
+	$(XFT_LIBS) \
+	$(PANGO_LIBS) \
+	$(GLIB_LIBS) \
+	$(XML_LIBS) \
+	parser/libobparser.la
 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) \
@@ -260,7 +271,9 @@ dist_thebear_theme_DATA = \
 pubinclude_HEADERS = \
 	render/render.h \
 	render/theme.h \
-	parser/parse.h \
+	parser/parse.h
+
+nodist_pubinclude_HEADERS = \
 	version.h
 
 nodist_pkgconfig_DATA = \
@@ -306,6 +319,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 \