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

diff --git a/Makefile.am b/Makefile.am
index 86a7e85d..e111dab5 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,13 @@ 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) \
+	$(X_LIBS)
 render_rendertest_SOURCES = render/test.c
 
 render_libobrender_la_CPPFLAGS = \
@@ -46,11 +53,6 @@ render_libobrender_la_CPPFLAGS = \
 	$(XML_CFLAGS) \
 	-DG_LOG_DOMAIN=\"ObRender\" \
 	-DDEFAULT_THEME=\"$(theme)\"
-render_libobrender_la_LIBADD = \
-	$(X_LIBS) \
-	$(XFT_LIBS) \
-	$(GLIB_LIBS) \
-	parser/libobparser.la
 render_libobrender_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 render_libobrender_la_SOURCES = \
@@ -83,9 +85,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,12 +106,14 @@ 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) \
+	$(X_LIBS) \
 	$(LIBSN_LIBS) \
 	$(XML_LIBS) \
 	$(EFENCE_LIBS) \
@@ -312,6 +313,8 @@ dist_noinst_DATA = \
 EXTRA_DIST = \
 	config.rpath \
 	mkinstalldirs \
+	CHANGELOG \
+	COMPLIANCE \
 	README \
 	COPYING \
 	AUTHORS