1.1 --- a/src/Makefile.am	Tue Mar 06 23:43:52 2012 -0600
     1.2 +++ b/src/Makefile.am	Wed Mar 07 00:13:50 2012 -0600
     1.3 @@ -1,4 +1,4 @@
     1.4 -SUBDIRS = clojure SFMT lua gb gba common filters prof sdl 
     1.5 +SUBDIRS = SFMT lua gb gba common filters prof sdl clojure
     1.6  
     1.7  dist_sysconf_DATA = VisualBoyAdvance.cfg
     1.8  

     2.1 --- a/src/clojure/Makefile.am	Tue Mar 06 23:43:52 2012 -0600
     2.2 +++ b/src/clojure/Makefile.am	Wed Mar 07 00:13:50 2012 -0600
     2.3 @@ -1,11 +1,18 @@
     2.4 -noinst_LTLIBRARIES = libgbclojure.la
     2.5 +lib_LTLIBRARIES = libvba.la
     2.6  
     2.7 -libgbclojure_la_SOURCES = \
     2.8 +libvba_la_SOURCES = \
     2.9  	clojure.c
    2.10  
    2.11 +libvba_la_LIBADD =   	\
    2.12 +	../common/libgbcom.la		\
    2.13 +	../gb/libgb.la			\
    2.14 +	../gba/libgba.la		\
    2.15 +	../filters/lib386.la 		\
    2.16 +	../filters/libfilter.la		\
    2.17 +	../prof/libprof.la		\
    2.18 +	../sdl/libgui.la		\
    2.19 +	../lua/libgblua.la       
    2.20 +
    2.21  AM_CPPFLAGS = \
    2.22  	-I$(top_srcdir)/java/headers -I$(JAVA_INCLUDE_PATH) \
    2.23  	-I$(JAVA_INCLUDE_PATH2)
    2.24 -
    2.25 -
    2.26 -

     3.1 --- a/src/sdl/Makefile.am	Tue Mar 06 23:43:52 2012 -0600
     3.2 +++ b/src/sdl/Makefile.am	Wed Mar 07 00:13:50 2012 -0600
     3.3 @@ -1,8 +1,8 @@
     3.4 -lib_LTLIBRARIES = libvba.la
     3.5 +noinst_LTLIBRARIES = libgui.la
     3.6  
     3.7  #noinst_PROGRAMS = TestEmu
     3.8  
     3.9 -libvba_la_SOURCES = \
    3.10 +libgui_la_SOURCES = \
    3.11  	Array.h		\
    3.12  	debugger.h	\
    3.13  	expr.cpp.h	\
    3.14 @@ -26,15 +26,15 @@
    3.15  #TestEmu.cpp
    3.16  
    3.17  
    3.18 -libvba_la_LIBADD =   	\
    3.19 -	../common/libgbcom.la		\
    3.20 -	../gb/libgb.la			\
    3.21 -	../gba/libgba.la		\
    3.22 -	../filters/lib386.la 		\
    3.23 -	../filters/libfilter.la		\
    3.24 -	../prof/libprof.la		\
    3.25 -	../clojure/libgbclojure.la	\
    3.26 -	../lua/libgblua.la       
    3.27 +# libvba_la_LIBADD =   	\
    3.28 +# 	../common/libgbcom.la		\
    3.29 +# 	../gb/libgb.la			\
    3.30 +# 	../gba/libgba.la		\
    3.31 +# 	../filters/lib386.la 		\
    3.32 +# 	../filters/libfilter.la		\
    3.33 +# 	../prof/libprof.la		\
    3.34 +# 	../clojure/libgbclojure.la	\
    3.35 +# 	../lua/libgblua.la       
    3.36  
    3.37  # TestEmu_SOURCES = \
    3.38  # 	TestEmu.cpp		\