1.1 --- a/src/Makefile.am	Thu Feb 23 08:41:07 2012 +1000
     1.2 +++ b/src/Makefile.am	Thu Feb 23 20:16:37 2012 +1000
     1.3 @@ -35,14 +35,15 @@
     1.4  	audio_alsa.lo audio_sdl.lo audio_esd.lo audio_pulse.lo input_lirc.lo \
     1.5  	lxdream_dummy.lo
     1.6  
     1.7 -#all-am: checkversion
     1.8 -
     1.9  AM_CPPFLAGS = @LXDREAMCPPFLAGS@
    1.10  
    1.11  lxdream_LINK = $(LINK) @LXDREAMLDFLAGS@
    1.12 -lxdream_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @LIBISOFS_LIBS@ $(INTLLIBS)
    1.13 -lxdream_SOURCES = \
    1.14 -        main.c version.c config.c config.h lxdream.h dream.h gui.h cpu.c cpu.h hook.h \
    1.15 +lxdream_LDADD = liblxdream-core.a @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @LIBISOFS_LIBS@ $(INTLLIBS) @LXDREAM_LIBS@
    1.16 +lxdream_SOURCES = main.c 
    1.17 +lxdream_LIBS = liblxdream-core.a
    1.18 +
    1.19 +noinst_LIBRARIES = liblxdream-core.a
    1.20 +liblxdream_core_a_SOURCES = version.c config.c config.h lxdream.h dream.h gui.h cpu.c cpu.h hook.h \
    1.21          gettext.h mem.c mem.h sdram.c mmio.h watch.c \
    1.22          asic.c asic.h clock.h serial.h \
    1.23          syscall.c syscall.h bios.c dcload.c gdbserver.c \
    1.24 @@ -83,7 +84,7 @@
    1.25  endif	
    1.26  
    1.27  if BUILD_SH4X86
    1.28 -lxdream_SOURCES += sh4/sh4x86.c xlat/x86/x86op.h \
    1.29 +liblxdream_core_a_SOURCES += sh4/sh4x86.c xlat/x86/x86op.h \
    1.30          xlat/x86/ia32abi.h xlat/x86/amd64abi.h \
    1.31          sh4/sh4trans.c sh4/sh4trans.h sh4/mmux86.c sh4/shadow.c \
    1.32          x86dasm/x86dasm.c x86dasm/x86dasm.h \
    1.33 @@ -106,17 +107,16 @@
    1.34  	gtkui/gtk_win.c gtkui/gtkcb.c gtkui/gtk_cfg.c \
    1.35          gtkui/gtk_mmio.c gtkui/gtk_debug.c gtkui/gtk_dump.c \
    1.36          gtkui/gtk_ctrl.c gtkui/gtk_gd.c \
    1.37 -        drivers/io_glib.c drivers/video_gtk.c
    1.38 +        drivers/video_gtk.c
    1.39  endif
    1.40  
    1.41  if GUI_COCOA
    1.42 +liblxdream_core_a_SOURCES += cocoaui/paths_osx.m drivers/io_osx.m drivers/mac_keymap.h drivers/mac_keymap.txt
    1.43  lxdream_SOURCES += cocoaui/cocoaui.m cocoaui/cocoaui.h cocoaui/cocoa_cfg.m \
    1.44  	cocoaui/cocoa_win.m cocoaui/cocoa_gd.m cocoaui/cocoa_prefs.m \
    1.45 -	cocoaui/cocoa_ctrl.m cocoaui/paths_osx.m \
    1.46 -	drivers/io_osx.m drivers/video_osx.m \
    1.47 -	drivers/mac_keymap.h drivers/mac_keymap.txt
    1.48 +	cocoaui/cocoa_ctrl.m drivers/video_osx.m
    1.49  else
    1.50 -lxdream_SOURCES += paths_unix.c
    1.51 +liblxdream_core_a_SOURCES += paths_unix.c drivers/io_glib.c
    1.52  endif
    1.53  
    1.54  if VIDEO_OSMESA
    1.55 @@ -263,4 +263,3 @@
    1.56  drivers/mac_keymap.h: dckeysyms.h drivers/mac_keymap.txt drivers/genkeymap.pl
    1.57  	$(mkdir_p) `dirname $@`
    1.58  	$(srcdir)/drivers/genkeymap.pl mac $(srcdir)/dckeysyms.h $(srcdir)/drivers/mac_keymap.txt $@
    1.59 -	
    1.60 \ No newline at end of file