X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Makefile.am;h=2b578b9b9d71df79a663a61031eb5c9ea89a96ba;hb=f6ba1f27b9790f56bda1e5831069e2dd7e2c96a2;hp=86a7e85d36068146af1247f9d9f69cab7004c13c;hpb=b3bbc2eadafdb6c61dc76356c2c12f59ea6ca04c;p=chaz%2Fopenbox

diff --git a/Makefile.am b/Makefile.am
index 86a7e85d..2b578b9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,8 @@ userscriptdir   = $(datadir)/openbox
 
 theme = TheBear
 
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = subdir-objects foreign
+
 ACLOCAL_AMFLAGS = -I m4
 
 INCLUDES = -I.
@@ -22,8 +23,8 @@ noinst_PROGRAMS = \
 	render/rendertest
 
 lib_LTLIBRARIES = \
-	render/libobrender.la \
-	parser/libobparser.la
+	parser/libobparser.la \
+	render/libobrender.la
 
 bin_PROGRAMS = \
 	openbox/openbox \
@@ -36,7 +37,12 @@ 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) \
+	$(XML_LIBS)
 render_rendertest_SOURCES = render/test.c
 
 render_libobrender_la_CPPFLAGS = \
@@ -47,10 +53,7 @@ render_libobrender_la_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"ObRender\" \
 	-DDEFAULT_THEME=\"$(theme)\"
 render_libobrender_la_LIBADD = \
-	$(X_LIBS) \
-	$(XFT_LIBS) \
-	$(GLIB_LIBS) \
-	parser/libobparser.la
+	$(X_LIBS)
 render_libobrender_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 render_libobrender_la_SOURCES = \
@@ -83,9 +86,6 @@ 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_SOURCES = \
@@ -107,6 +107,7 @@ openbox_openbox_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Openbox\"
 openbox_openbox_LDADD = \
 	$(SM_LIBS) \
+	$(XFT_LIBS) \
 	$(XINERAMA_LIBS) \
 	$(XKB_LIBS) \
 	$(XRANDR_LIBS) \
@@ -312,6 +313,7 @@ dist_noinst_DATA = \
 EXTRA_DIST = \
 	config.rpath \
 	mkinstalldirs \
+	CHANGELOG \
 	README \
 	COPYING \
 	AUTHORS