# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1331100830 21600
# Node ID efa68261dba1cf6a88c45df00711a74de9d2a3f2
# Parent  b1969e1b310dab9f3aec3855fa1687fd6bd9cb68
changed compile order

diff -r b1969e1b310d -r efa68261dba1 src/Makefile.am
--- a/src/Makefile.am	Tue Mar 06 23:43:52 2012 -0600
+++ b/src/Makefile.am	Wed Mar 07 00:13:50 2012 -0600
@@ -1,4 +1,4 @@
-SUBDIRS = clojure SFMT lua gb gba common filters prof sdl 
+SUBDIRS = SFMT lua gb gba common filters prof sdl clojure
 
 dist_sysconf_DATA = VisualBoyAdvance.cfg
 
diff -r b1969e1b310d -r efa68261dba1 src/clojure/Makefile.am
--- a/src/clojure/Makefile.am	Tue Mar 06 23:43:52 2012 -0600
+++ b/src/clojure/Makefile.am	Wed Mar 07 00:13:50 2012 -0600
@@ -1,11 +1,18 @@
-noinst_LTLIBRARIES = libgbclojure.la
+lib_LTLIBRARIES = libvba.la
 
-libgbclojure_la_SOURCES = \
+libvba_la_SOURCES = \
 	clojure.c
 
+libvba_la_LIBADD =   	\
+	../common/libgbcom.la		\
+	../gb/libgb.la			\
+	../gba/libgba.la		\
+	../filters/lib386.la 		\
+	../filters/libfilter.la		\
+	../prof/libprof.la		\
+	../sdl/libgui.la		\
+	../lua/libgblua.la       
+
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/java/headers -I$(JAVA_INCLUDE_PATH) \
 	-I$(JAVA_INCLUDE_PATH2)
-
-
-
diff -r b1969e1b310d -r efa68261dba1 src/sdl/Makefile.am
--- a/src/sdl/Makefile.am	Tue Mar 06 23:43:52 2012 -0600
+++ b/src/sdl/Makefile.am	Wed Mar 07 00:13:50 2012 -0600
@@ -1,8 +1,8 @@
-lib_LTLIBRARIES = libvba.la
+noinst_LTLIBRARIES = libgui.la
 
 #noinst_PROGRAMS = TestEmu
 
-libvba_la_SOURCES = \
+libgui_la_SOURCES = \
 	Array.h		\
 	debugger.h	\
 	expr.cpp.h	\
@@ -26,15 +26,15 @@
 #TestEmu.cpp
 
 
-libvba_la_LIBADD =   	\
-	../common/libgbcom.la		\
-	../gb/libgb.la			\
-	../gba/libgba.la		\
-	../filters/lib386.la 		\
-	../filters/libfilter.la		\
-	../prof/libprof.la		\
-	../clojure/libgbclojure.la	\
-	../lua/libgblua.la       
+# libvba_la_LIBADD =   	\
+# 	../common/libgbcom.la		\
+# 	../gb/libgb.la			\
+# 	../gba/libgba.la		\
+# 	../filters/lib386.la 		\
+# 	../filters/libfilter.la		\
+# 	../prof/libprof.la		\
+# 	../clojure/libgbclojure.la	\
+# 	../lua/libgblua.la       
 
 # TestEmu_SOURCES = \
 # 	TestEmu.cpp		\