X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=710999c7ce370baa3fa521c97df5bd7709318ad5;hb=a5100fe6770d5b223cf444eda5629c2b2208cb29;hp=450b85f162aae06adacc489c7d4087e8d38db18d;hpb=74d855593a3ebf4a61dd5d31e9b36de41b8bdf85;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 450b85f1..710999c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,7 @@ userscriptdir   = $(datadir)/openbox
 theme = TheBear
 
 AUTOMAKE_OPTIONS = subdir-objects foreign
+
 ACLOCAL_AMFLAGS = -I m4
 
 INCLUDES = -I.
@@ -36,7 +37,14 @@ render_rendertest_CPPFLAGS = \
 	$(XFT_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	-DG_LOG_DOMAIN=\"RenderTest\"
-render_rendertest_LDADD = render/libobrender.la
+render_rendertest_LDADD = \
+	parser/libobparser.la \
+	render/libobrender.la \
+	$(XFT_LIBS) \
+	$(GLIB_LIBS) \
+	$(PANGO_LIBS) \
+	$(XML_LIBS) \
+	$(X_LIBS)
 render_rendertest_SOURCES = render/test.c
 
 render_libobrender_la_CPPFLAGS = \
@@ -44,15 +52,17 @@ 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) \
-	parser/libobparser.la
-render_libobrender_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+	$(XML_LIBS) 
 render_libobrender_la_SOURCES = \
 	gettext.h \
 	render/color.h \
@@ -83,11 +93,11 @@ parser_libobparser_la_CPPFLAGS = \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DCONFIGDIR=\"$(configdir)\"
-parser_libobparser_la_LIBADD = \
-	$(GLIB_LIBS) \
-	$(XML_LIBS)
 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
@@ -113,6 +123,7 @@ openbox_openbox_LDADD = \
 	$(VIDMODE_LIBS) \
 	$(XSHAPE_LIBS) \
 	$(GLIB_LIBS) \
+	$(X_LIBS) \
 	$(LIBSN_LIBS) \
 	$(XML_LIBS) \
 	$(EFENCE_LIBS) \
@@ -261,6 +272,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
@@ -304,6 +318,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 \
@@ -312,6 +327,8 @@ dist_noinst_DATA = \
 EXTRA_DIST = \
 	config.rpath \
 	mkinstalldirs \
+	CHANGELOG \
+	COMPLIANCE \
 	README \
 	COPYING \
 	AUTHORS