From 2daac503a3a2f149f883db7c30199ebbb1f00c7f Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Tue, 16 Nov 2010 19:26:53 +0000
Subject: cleaned up autoconf/automake project files, this should solve build
 order and dependency issues

---
 src/render/Makefile.am | 49 +++++++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 20 deletions(-)

(limited to 'src/render/Makefile.am')

diff --git a/src/render/Makefile.am b/src/render/Makefile.am
index 4389805..2e97501 100644
--- a/src/render/Makefile.am
+++ b/src/render/Makefile.am
@@ -7,9 +7,25 @@ else
 noinst_LTLIBRARIES = librender.la
 endif
 
-librender_la_LDFLAGS = -avoid-version -no-undefined @GL_LIBS@
+noinst_HEADERS = \
+	camera.h \
+	debugdrawer.h \
+	draw.h \
+	dust.h \
+	gl.h \
+	image.h \
+	jpgfile.h \
+	particles.h \
+	pngfile.h \
+	render.h \
+	renderext.h \
+	screenshot.h \
+	sky.h \
+	state.h \
+	text.h \
+	textures.h \
+	tgafile.h
 
-librender_la_LIBADD = $(top_builddir)/src/math/libmath.la
 
 librender_la_SOURCES = \
 	camera.cc \
@@ -30,21 +46,14 @@ librender_la_SOURCES = \
 	textures.cc \
 	tgafile.cc
 
-noinst_HEADERS = \
-	camera.h \
-	debugdrawer.h \
-	draw.h \
-	dust.h \
-	gl.h \
-	image.h \
-	jpgfile.h \
-	particles.h \
-	pngfile.h \
-	render.h \
-	renderext.h \
-	screenshot.h \
-	sky.h \
-	state.h \
-	text.h \
-	textures.h \
-	tgafile.h
+librender_la_DEPENDENCIES = \
+	$(top_builddir)/src/auxiliary/libauxiliary.la \
+	$(top_builddir)/src/math/libmath.la \
+	$(top_builddir)/src/sys/libsys.la \
+	$(top_builddir)/src/filesystem/libfilesystem.la \
+	$(top_builddir)/src/model/libmodel.la \
+	$(top_builddir)/src/core/libcore.la
+
+librender_la_LDFLAGS = -avoid-version -no-undefined
+
+librender_la_LIBADD =
-- 
cgit v1.2.3