Search
lxdream.org :: lxdream :: r1226:227ceb186ba7
lxdream 0.9.1
released Jun 29
Download Now
changeset1226:227ceb186ba7
parent1225:73dd41cb37a8
child1227:cf6126df0398
authornkeynes
dateThu Feb 23 08:49:32 2012 +1000 (7 years ago)
Build all the non video/GUI bits into a static lib for convenience
Makefile.in
configure
configure.in
src/Makefile.am
src/Makefile.in
src/tools/Makefile.in
1.1 --- a/Makefile.in Thu Feb 23 08:41:07 2012 +1000
1.2 +++ b/Makefile.in Thu Feb 23 08:49:32 2012 +1000
1.3 @@ -218,6 +218,7 @@
1.4 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
1.5 PULSE_CFLAGS = @PULSE_CFLAGS@
1.6 PULSE_LIBS = @PULSE_LIBS@
1.7 +RANLIB = @RANLIB@
1.8 SDL_CFLAGS = @SDL_CFLAGS@
1.9 SDL_LIBS = @SDL_LIBS@
1.10 SED = @SED@
2.1 --- a/configure Thu Feb 23 08:41:07 2012 +1000
2.2 +++ b/configure Thu Feb 23 08:49:32 2012 +1000
2.3 @@ -720,6 +720,7 @@
2.4 SED
2.5 CCAS
2.6 CCASFLAGS
2.7 +RANLIB
2.8 GREP
2.9 EGREP
2.10 OBJCDEPMODE
2.11 @@ -7335,6 +7336,102 @@
2.12
2.13
2.14
2.15 +if test -n "$ac_tool_prefix"; then
2.16 + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
2.17 +set dummy ${ac_tool_prefix}ranlib; ac_word=$2
2.18 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2.19 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2.20 +if test "${ac_cv_prog_RANLIB+set}" = set; then
2.21 + echo $ECHO_N "(cached) $ECHO_C" >&6
2.22 +else
2.23 + if test -n "$RANLIB"; then
2.24 + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
2.25 +else
2.26 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2.27 +for as_dir in $PATH
2.28 +do
2.29 + IFS=$as_save_IFS
2.30 + test -z "$as_dir" && as_dir=.
2.31 + for ac_exec_ext in '' $ac_executable_extensions; do
2.32 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2.33 + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
2.34 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2.35 + break 2
2.36 + fi
2.37 +done
2.38 +done
2.39 +IFS=$as_save_IFS
2.40 +
2.41 +fi
2.42 +fi
2.43 +RANLIB=$ac_cv_prog_RANLIB
2.44 +if test -n "$RANLIB"; then
2.45 + { echo "$as_me:$LINENO: result: $RANLIB" >&5
2.46 +echo "${ECHO_T}$RANLIB" >&6; }
2.47 +else
2.48 + { echo "$as_me:$LINENO: result: no" >&5
2.49 +echo "${ECHO_T}no" >&6; }
2.50 +fi
2.51 +
2.52 +
2.53 +fi
2.54 +if test -z "$ac_cv_prog_RANLIB"; then
2.55 + ac_ct_RANLIB=$RANLIB
2.56 + # Extract the first word of "ranlib", so it can be a program name with args.
2.57 +set dummy ranlib; ac_word=$2
2.58 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2.59 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2.60 +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
2.61 + echo $ECHO_N "(cached) $ECHO_C" >&6
2.62 +else
2.63 + if test -n "$ac_ct_RANLIB"; then
2.64 + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
2.65 +else
2.66 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2.67 +for as_dir in $PATH
2.68 +do
2.69 + IFS=$as_save_IFS
2.70 + test -z "$as_dir" && as_dir=.
2.71 + for ac_exec_ext in '' $ac_executable_extensions; do
2.72 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2.73 + ac_cv_prog_ac_ct_RANLIB="ranlib"
2.74 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2.75 + break 2
2.76 + fi
2.77 +done
2.78 +done
2.79 +IFS=$as_save_IFS
2.80 +
2.81 +fi
2.82 +fi
2.83 +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
2.84 +if test -n "$ac_ct_RANLIB"; then
2.85 + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
2.86 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
2.87 +else
2.88 + { echo "$as_me:$LINENO: result: no" >&5
2.89 +echo "${ECHO_T}no" >&6; }
2.90 +fi
2.91 +
2.92 + if test "x$ac_ct_RANLIB" = x; then
2.93 + RANLIB=":"
2.94 + else
2.95 + case $cross_compiling:$ac_tool_warned in
2.96 +yes:)
2.97 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
2.98 +whose name does not start with the host triplet. If you think this
2.99 +configuration is useful to you, please write to autoconf@gnu.org." >&5
2.100 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
2.101 +whose name does not start with the host triplet. If you think this
2.102 +configuration is useful to you, please write to autoconf@gnu.org." >&2;}
2.103 +ac_tool_warned=yes ;;
2.104 +esac
2.105 + RANLIB=$ac_ct_RANLIB
2.106 + fi
2.107 +else
2.108 + RANLIB="$ac_cv_prog_RANLIB"
2.109 +fi
2.110 +
2.111
2.112 { echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
2.113 echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
2.114 @@ -16369,6 +16466,7 @@
2.115 SED!$SED$ac_delim
2.116 CCAS!$CCAS$ac_delim
2.117 CCASFLAGS!$CCASFLAGS$ac_delim
2.118 +RANLIB!$RANLIB$ac_delim
2.119 GREP!$GREP$ac_delim
2.120 EGREP!$EGREP$ac_delim
2.121 OBJCDEPMODE!$OBJCDEPMODE$ac_delim
2.122 @@ -16455,7 +16553,6 @@
2.123 XGETTEXT!$XGETTEXT$ac_delim
2.124 CATALOGS!$CATALOGS$ac_delim
2.125 CATOBJEXT!$CATOBJEXT$ac_delim
2.126 -DATADIRNAME!$DATADIRNAME$ac_delim
2.127 _ACEOF
2.128
2.129 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
2.130 @@ -16497,6 +16594,7 @@
2.131 ac_delim='%!_!# '
2.132 for ac_last_try in false false false false false :; do
2.133 cat >conf$$subs.sed <<_ACEOF
2.134 +DATADIRNAME!$DATADIRNAME$ac_delim
2.135 GMOFILES!$GMOFILES$ac_delim
2.136 INSTOBJEXT!$INSTOBJEXT$ac_delim
2.137 INTLLIBS!$INTLLIBS$ac_delim
2.138 @@ -16509,7 +16607,7 @@
2.139 LTLIBOBJS!$LTLIBOBJS$ac_delim
2.140 _ACEOF
2.141
2.142 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 10; then
2.143 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then
2.144 break
2.145 elif $ac_last_try; then
2.146 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
3.1 --- a/configure.in Thu Feb 23 08:41:07 2012 +1000
3.2 +++ b/configure.in Thu Feb 23 08:49:32 2012 +1000
3.3 @@ -17,6 +17,7 @@
3.4 AC_PROG_OBJC
3.5 AC_PROG_SED
3.6 AM_PROG_AS
3.7 +AC_PROG_RANLIB
3.8 AC_CHECK_SIZEOF([void *])
3.9 AC_HEADER_STDC
3.10
4.1 --- a/src/Makefile.am Thu Feb 23 08:41:07 2012 +1000
4.2 +++ b/src/Makefile.am Thu Feb 23 08:49:32 2012 +1000
4.3 @@ -35,14 +35,15 @@
4.4 audio_alsa.lo audio_sdl.lo audio_esd.lo audio_pulse.lo input_lirc.lo \
4.5 lxdream_dummy.lo
4.6
4.7 -#all-am: checkversion
4.8 -
4.9 AM_CPPFLAGS = @LXDREAMCPPFLAGS@
4.10
4.11 lxdream_LINK = $(LINK) @LXDREAMLDFLAGS@
4.12 -lxdream_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @LIBISOFS_LIBS@ $(INTLLIBS)
4.13 -lxdream_SOURCES = \
4.14 - main.c version.c config.c config.h lxdream.h dream.h gui.h cpu.c cpu.h hook.h \
4.15 +lxdream_LDADD = liblxdream-core.a @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @LIBISOFS_LIBS@ $(INTLLIBS) @LXDREAM_LIBS@
4.16 +lxdream_SOURCES = main.c
4.17 +lxdream_LIBS = liblxdream-core.a
4.18 +
4.19 +noinst_LIBRARIES = liblxdream-core.a
4.20 +liblxdream_core_a_SOURCES = version.c config.c config.h lxdream.h dream.h gui.h cpu.c cpu.h hook.h \
4.21 gettext.h mem.c mem.h sdram.c mmio.h watch.c \
4.22 asic.c asic.h clock.h serial.h \
4.23 syscall.c syscall.h bios.c dcload.c gdbserver.c \
4.24 @@ -83,7 +84,7 @@
4.25 endif
4.26
4.27 if BUILD_SH4X86
4.28 -lxdream_SOURCES += sh4/sh4x86.c xlat/x86/x86op.h \
4.29 +liblxdream_core_a_SOURCES += sh4/sh4x86.c xlat/x86/x86op.h \
4.30 xlat/x86/ia32abi.h xlat/x86/amd64abi.h \
4.31 sh4/sh4trans.c sh4/sh4trans.h sh4/mmux86.c sh4/shadow.c \
4.32 x86dasm/x86dasm.c x86dasm/x86dasm.h \
4.33 @@ -106,17 +107,16 @@
4.34 gtkui/gtk_win.c gtkui/gtkcb.c gtkui/gtk_cfg.c \
4.35 gtkui/gtk_mmio.c gtkui/gtk_debug.c gtkui/gtk_dump.c \
4.36 gtkui/gtk_ctrl.c gtkui/gtk_gd.c \
4.37 - drivers/io_glib.c drivers/video_gtk.c
4.38 + drivers/video_gtk.c
4.39 endif
4.40
4.41 if GUI_COCOA
4.42 +liblxdream_core_a_SOURCES += cocoaui/paths_osx.m drivers/io_osx.m drivers/mac_keymap.h drivers/mac_keymap.txt
4.43 lxdream_SOURCES += cocoaui/cocoaui.m cocoaui/cocoaui.h cocoaui/cocoa_cfg.m \
4.44 cocoaui/cocoa_win.m cocoaui/cocoa_gd.m cocoaui/cocoa_prefs.m \
4.45 - cocoaui/cocoa_ctrl.m cocoaui/paths_osx.m \
4.46 - drivers/io_osx.m drivers/video_osx.m \
4.47 - drivers/mac_keymap.h drivers/mac_keymap.txt
4.48 + cocoaui/cocoa_ctrl.m drivers/video_osx.m
4.49 else
4.50 -lxdream_SOURCES += paths_unix.c
4.51 +liblxdream_core_a_SOURCES += paths_unix.c drivers/io_glib.c
4.52 endif
4.53
4.54 if VIDEO_OSMESA
4.55 @@ -263,4 +263,3 @@
4.56 drivers/mac_keymap.h: dckeysyms.h drivers/mac_keymap.txt drivers/genkeymap.pl
4.57 $(mkdir_p) `dirname $@`
4.58 $(srcdir)/drivers/genkeymap.pl mac $(srcdir)/dckeysyms.h $(srcdir)/drivers/mac_keymap.txt $@
4.59 -
4.60 \ No newline at end of file
5.1 --- a/src/Makefile.in Thu Feb 23 08:41:07 2012 +1000
5.2 +++ b/src/Makefile.in Thu Feb 23 08:49:32 2012 +1000
5.3 @@ -14,6 +14,7 @@
5.4
5.5 @SET_MAKE@
5.6
5.7 +
5.8 srcdir = @srcdir@
5.9 top_srcdir = @top_srcdir@
5.10 VPATH = @srcdir@
5.11 @@ -55,39 +56,38 @@
5.12 @GUI_GTK_TRUE@ gtkui/gtk_win.c gtkui/gtkcb.c gtkui/gtk_cfg.c \
5.13 @GUI_GTK_TRUE@ gtkui/gtk_mmio.c gtkui/gtk_debug.c gtkui/gtk_dump.c \
5.14 @GUI_GTK_TRUE@ gtkui/gtk_ctrl.c gtkui/gtk_gd.c \
5.15 -@GUI_GTK_TRUE@ drivers/io_glib.c drivers/video_gtk.c
5.16 +@GUI_GTK_TRUE@ drivers/video_gtk.c
5.17
5.18 -@GUI_COCOA_TRUE@am__append_5 = cocoaui/cocoaui.m cocoaui/cocoaui.h cocoaui/cocoa_cfg.m \
5.19 +@GUI_COCOA_TRUE@am__append_5 = cocoaui/paths_osx.m drivers/io_osx.m drivers/mac_keymap.h drivers/mac_keymap.txt
5.20 +@GUI_COCOA_TRUE@am__append_6 = cocoaui/cocoaui.m cocoaui/cocoaui.h cocoaui/cocoa_cfg.m \
5.21 @GUI_COCOA_TRUE@ cocoaui/cocoa_win.m cocoaui/cocoa_gd.m cocoaui/cocoa_prefs.m \
5.22 -@GUI_COCOA_TRUE@ cocoaui/cocoa_ctrl.m cocoaui/paths_osx.m \
5.23 -@GUI_COCOA_TRUE@ drivers/io_osx.m drivers/video_osx.m \
5.24 -@GUI_COCOA_TRUE@ drivers/mac_keymap.h drivers/mac_keymap.txt
5.25 +@GUI_COCOA_TRUE@ cocoaui/cocoa_ctrl.m drivers/video_osx.m
5.26
5.27 -@GUI_COCOA_FALSE@am__append_6 = paths_unix.c
5.28 -@VIDEO_OSMESA_TRUE@am__append_7 = drivers/video_gdk.c
5.29 -@VIDEO_GLX_TRUE@am__append_8 = drivers/video_glx.c drivers/video_glx.h
5.30 -@VIDEO_NSGL_TRUE@am__append_9 = drivers/video_nsgl.m drivers/video_nsgl.h
5.31 -@AUDIO_OSX_TRUE@am__append_10 = drivers/audio_osx.m
5.32 -@BUILD_PLUGINS_TRUE@am__append_11 = lxdream_dummy.@SOEXT@
5.33 -@AUDIO_SDL_TRUE@@BUILD_PLUGINS_TRUE@am__append_12 = audio_sdl.@SOEXT@
5.34 -@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_TRUE@am__append_13 = audio_pulse.@SOEXT@
5.35 -@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_TRUE@am__append_14 = audio_esd.@SOEXT@
5.36 -@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_TRUE@am__append_15 = audio_alsa.@SOEXT@
5.37 -@BUILD_PLUGINS_TRUE@@INPUT_LIRC_TRUE@am__append_16 = input_lirc.@SOEXT@
5.38 -@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@am__append_17 = drivers/audio_sdl.c
5.39 -@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@am__append_18 = @SDL_LIBS@
5.40 -@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@am__append_19 = drivers/audio_pulse.c
5.41 -@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@am__append_20 = @PULSE_LIBS@
5.42 -@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@am__append_21 = drivers/audio_esd.c
5.43 -@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@am__append_22 = @ESOUND_LIBS@
5.44 -@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@am__append_23 = drivers/audio_alsa.c
5.45 -@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@am__append_24 = @ALSA_LIBS@
5.46 -@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@am__append_25 = drivers/input_lirc.c
5.47 -@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@am__append_26 = -llirc_client
5.48 -@CDROM_LINUX_TRUE@am__append_27 = drivers/cdrom/cd_linux.c
5.49 -@CDROM_OSX_TRUE@am__append_28 = drivers/cdrom/cd_osx.c drivers/osx_iokit.m drivers/osx_iokit.h
5.50 -@CDROM_NONE_TRUE@am__append_29 = drivers/cdrom/cd_none.c
5.51 -@JOY_LINUX_TRUE@am__append_30 = drivers/joy_linux.c drivers/joy_linux.h
5.52 +@GUI_COCOA_FALSE@am__append_7 = paths_unix.c drivers/io_glib.c
5.53 +@VIDEO_OSMESA_TRUE@am__append_8 = drivers/video_gdk.c
5.54 +@VIDEO_GLX_TRUE@am__append_9 = drivers/video_glx.c drivers/video_glx.h
5.55 +@VIDEO_NSGL_TRUE@am__append_10 = drivers/video_nsgl.m drivers/video_nsgl.h
5.56 +@AUDIO_OSX_TRUE@am__append_11 = drivers/audio_osx.m
5.57 +@BUILD_PLUGINS_TRUE@am__append_12 = lxdream_dummy.@SOEXT@
5.58 +@AUDIO_SDL_TRUE@@BUILD_PLUGINS_TRUE@am__append_13 = audio_sdl.@SOEXT@
5.59 +@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_TRUE@am__append_14 = audio_pulse.@SOEXT@
5.60 +@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_TRUE@am__append_15 = audio_esd.@SOEXT@
5.61 +@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_TRUE@am__append_16 = audio_alsa.@SOEXT@
5.62 +@BUILD_PLUGINS_TRUE@@INPUT_LIRC_TRUE@am__append_17 = input_lirc.@SOEXT@
5.63 +@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@am__append_18 = drivers/audio_sdl.c
5.64 +@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@am__append_19 = @SDL_LIBS@
5.65 +@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@am__append_20 = drivers/audio_pulse.c
5.66 +@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@am__append_21 = @PULSE_LIBS@
5.67 +@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@am__append_22 = drivers/audio_esd.c
5.68 +@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@am__append_23 = @ESOUND_LIBS@
5.69 +@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@am__append_24 = drivers/audio_alsa.c
5.70 +@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@am__append_25 = @ALSA_LIBS@
5.71 +@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@am__append_26 = drivers/input_lirc.c
5.72 +@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@am__append_27 = -llirc_client
5.73 +@CDROM_LINUX_TRUE@am__append_28 = drivers/cdrom/cd_linux.c
5.74 +@CDROM_OSX_TRUE@am__append_29 = drivers/cdrom/cd_osx.c drivers/osx_iokit.m drivers/osx_iokit.h
5.75 +@CDROM_NONE_TRUE@am__append_30 = drivers/cdrom/cd_none.c
5.76 +@JOY_LINUX_TRUE@am__append_31 = drivers/joy_linux.c drivers/joy_linux.h
5.77 subdir = src
5.78 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
5.79 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
5.80 @@ -98,38 +98,12 @@
5.81 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
5.82 CONFIG_HEADER = $(top_builddir)/config.h
5.83 CONFIG_CLEAN_FILES =
5.84 -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibdir)"
5.85 -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
5.86 -@BUILD_SH4X86_TRUE@am__EXEEXT_1 = test/testsh4x86$(EXEEXT)
5.87 -@BUILD_PLUGINS_TRUE@am__EXEEXT_2 = lxdream_dummy.@SOEXT@$(EXEEXT)
5.88 -@AUDIO_SDL_TRUE@@BUILD_PLUGINS_TRUE@am__EXEEXT_3 = audio_sdl.@SOEXT@$(EXEEXT)
5.89 -@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_TRUE@am__EXEEXT_4 = audio_pulse.@SOEXT@$(EXEEXT)
5.90 -@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_TRUE@am__EXEEXT_5 = audio_esd.@SOEXT@$(EXEEXT)
5.91 -@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_TRUE@am__EXEEXT_6 = audio_alsa.@SOEXT@$(EXEEXT)
5.92 -@BUILD_PLUGINS_TRUE@@INPUT_LIRC_TRUE@am__EXEEXT_7 = input_lirc.@SOEXT@$(EXEEXT)
5.93 -pkglibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
5.94 -PROGRAMS = $(bin_PROGRAMS) $(pkglib_PROGRAMS)
5.95 -am_audio_alsa_@SOEXT@_OBJECTS =
5.96 -audio_alsa_@SOEXT@_OBJECTS = $(am_audio_alsa_@SOEXT@_OBJECTS)
5.97 -@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_TRUE@audio_alsa_@SOEXT@_DEPENDENCIES = \
5.98 -@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_TRUE@ audio_alsa.lo
5.99 -am_audio_esd_@SOEXT@_OBJECTS =
5.100 -audio_esd_@SOEXT@_OBJECTS = $(am_audio_esd_@SOEXT@_OBJECTS)
5.101 -@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_TRUE@audio_esd_@SOEXT@_DEPENDENCIES = \
5.102 -@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_TRUE@ audio_esd.lo
5.103 -am_audio_pulse_@SOEXT@_OBJECTS =
5.104 -audio_pulse_@SOEXT@_OBJECTS = $(am_audio_pulse_@SOEXT@_OBJECTS)
5.105 -@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_TRUE@audio_pulse_@SOEXT@_DEPENDENCIES = \
5.106 -@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_TRUE@ audio_pulse.lo
5.107 -am_audio_sdl_@SOEXT@_OBJECTS =
5.108 -audio_sdl_@SOEXT@_OBJECTS = $(am_audio_sdl_@SOEXT@_OBJECTS)
5.109 -@AUDIO_SDL_TRUE@@BUILD_PLUGINS_TRUE@audio_sdl_@SOEXT@_DEPENDENCIES = \
5.110 -@AUDIO_SDL_TRUE@@BUILD_PLUGINS_TRUE@ audio_sdl.lo
5.111 -am_input_lirc_@SOEXT@_OBJECTS =
5.112 -input_lirc_@SOEXT@_OBJECTS = $(am_input_lirc_@SOEXT@_OBJECTS)
5.113 -@BUILD_PLUGINS_TRUE@@INPUT_LIRC_TRUE@input_lirc_@SOEXT@_DEPENDENCIES = \
5.114 -@BUILD_PLUGINS_TRUE@@INPUT_LIRC_TRUE@ input_lirc.lo
5.115 -am__lxdream_SOURCES_DIST = main.c version.c config.c config.h \
5.116 +LIBRARIES = $(noinst_LIBRARIES)
5.117 +AR = ar
5.118 +ARFLAGS = cru
5.119 +liblxdream_core_a_AR = $(AR) $(ARFLAGS)
5.120 +liblxdream_core_a_LIBADD =
5.121 +am__liblxdream_core_a_SOURCES_DIST = version.c config.c config.h \
5.122 lxdream.h dream.h gui.h cpu.c cpu.h hook.h gettext.h mem.c \
5.123 mem.h sdram.c mmio.h watch.c asic.c asic.h clock.h serial.h \
5.124 syscall.c syscall.h bios.c dcload.c gdbserver.c ioutil.c \
5.125 @@ -166,64 +140,22 @@
5.126 drivers/cdrom/cd_mmc.c drivers/cdrom/isofs.h \
5.127 drivers/cdrom/isofs.c drivers/cdrom/isomem.c sh4/sh4.def \
5.128 sh4/sh4core.in sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in \
5.129 - hotkeys.c hotkeys.h plugin.c plugin.h sh4/sh4x86.c \
5.130 - xlat/x86/x86op.h xlat/x86/ia32abi.h xlat/x86/amd64abi.h \
5.131 - sh4/sh4trans.c sh4/sh4trans.h sh4/mmux86.c sh4/shadow.c \
5.132 - x86dasm/x86dasm.c x86dasm/x86dasm.h x86dasm/i386-dis.c \
5.133 - x86dasm/dis-init.c x86dasm/dis-buf.c x86dasm/ansidecl.h \
5.134 - x86dasm/bfd.h x86dasm/dis-asm.h x86dasm/symcat.h \
5.135 - x86dasm/sysdep.h gtkui/gtkui.c gtkui/gtkui.h gtkui/gtk_win.c \
5.136 - gtkui/gtkcb.c gtkui/gtk_cfg.c gtkui/gtk_mmio.c \
5.137 - gtkui/gtk_debug.c gtkui/gtk_dump.c gtkui/gtk_ctrl.c \
5.138 - gtkui/gtk_gd.c drivers/io_glib.c drivers/video_gtk.c \
5.139 - cocoaui/cocoaui.m cocoaui/cocoaui.h cocoaui/cocoa_cfg.m \
5.140 - cocoaui/cocoa_win.m cocoaui/cocoa_gd.m cocoaui/cocoa_prefs.m \
5.141 - cocoaui/cocoa_ctrl.m cocoaui/paths_osx.m drivers/io_osx.m \
5.142 - drivers/video_osx.m drivers/mac_keymap.h \
5.143 - drivers/mac_keymap.txt paths_unix.c drivers/video_gdk.c \
5.144 - drivers/video_glx.c drivers/video_glx.h drivers/video_nsgl.m \
5.145 - drivers/video_nsgl.h drivers/audio_osx.m drivers/audio_sdl.c \
5.146 - drivers/audio_pulse.c drivers/audio_esd.c drivers/audio_alsa.c \
5.147 - drivers/input_lirc.c drivers/cdrom/cd_linux.c \
5.148 - drivers/cdrom/cd_osx.c drivers/osx_iokit.m drivers/osx_iokit.h \
5.149 - drivers/cdrom/cd_none.c drivers/joy_linux.c \
5.150 - drivers/joy_linux.h
5.151 -@BUILD_PLUGINS_TRUE@am__objects_1 = plugin.$(OBJEXT)
5.152 -@BUILD_SH4X86_TRUE@am__objects_2 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \
5.153 + hotkeys.c hotkeys.h sh4/sh4x86.c xlat/x86/x86op.h \
5.154 + xlat/x86/ia32abi.h xlat/x86/amd64abi.h sh4/sh4trans.c \
5.155 + sh4/sh4trans.h sh4/mmux86.c sh4/shadow.c x86dasm/x86dasm.c \
5.156 + x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
5.157 + x86dasm/dis-buf.c x86dasm/ansidecl.h x86dasm/bfd.h \
5.158 + x86dasm/dis-asm.h x86dasm/symcat.h x86dasm/sysdep.h \
5.159 + cocoaui/paths_osx.m drivers/io_osx.m drivers/mac_keymap.h \
5.160 + drivers/mac_keymap.txt paths_unix.c drivers/io_glib.c
5.161 +@BUILD_SH4X86_TRUE@am__objects_1 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \
5.162 @BUILD_SH4X86_TRUE@ mmux86.$(OBJEXT) shadow.$(OBJEXT) \
5.163 @BUILD_SH4X86_TRUE@ x86dasm.$(OBJEXT) i386-dis.$(OBJEXT) \
5.164 @BUILD_SH4X86_TRUE@ dis-init.$(OBJEXT) dis-buf.$(OBJEXT)
5.165 -@GUI_GTK_TRUE@am__objects_3 = gtkui.$(OBJEXT) gtk_win.$(OBJEXT) \
5.166 -@GUI_GTK_TRUE@ gtkcb.$(OBJEXT) gtk_cfg.$(OBJEXT) \
5.167 -@GUI_GTK_TRUE@ gtk_mmio.$(OBJEXT) gtk_debug.$(OBJEXT) \
5.168 -@GUI_GTK_TRUE@ gtk_dump.$(OBJEXT) gtk_ctrl.$(OBJEXT) \
5.169 -@GUI_GTK_TRUE@ gtk_gd.$(OBJEXT) io_glib.$(OBJEXT) \
5.170 -@GUI_GTK_TRUE@ video_gtk.$(OBJEXT)
5.171 -@GUI_COCOA_TRUE@am__objects_4 = cocoaui.$(OBJEXT) cocoa_cfg.$(OBJEXT) \
5.172 -@GUI_COCOA_TRUE@ cocoa_win.$(OBJEXT) cocoa_gd.$(OBJEXT) \
5.173 -@GUI_COCOA_TRUE@ cocoa_prefs.$(OBJEXT) cocoa_ctrl.$(OBJEXT) \
5.174 -@GUI_COCOA_TRUE@ paths_osx.$(OBJEXT) io_osx.$(OBJEXT) \
5.175 -@GUI_COCOA_TRUE@ video_osx.$(OBJEXT)
5.176 -@GUI_COCOA_FALSE@am__objects_5 = paths_unix.$(OBJEXT)
5.177 -@VIDEO_OSMESA_TRUE@am__objects_6 = video_gdk.$(OBJEXT)
5.178 -@VIDEO_GLX_TRUE@am__objects_7 = video_glx.$(OBJEXT)
5.179 -@VIDEO_NSGL_TRUE@am__objects_8 = video_nsgl.$(OBJEXT)
5.180 -@AUDIO_OSX_TRUE@am__objects_9 = audio_osx.$(OBJEXT)
5.181 -@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@am__objects_10 = \
5.182 -@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@ audio_sdl.$(OBJEXT)
5.183 -@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@am__objects_11 = \
5.184 -@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@ audio_pulse.$(OBJEXT)
5.185 -@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@am__objects_12 = \
5.186 -@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@ audio_esd.$(OBJEXT)
5.187 -@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@am__objects_13 = \
5.188 -@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@ audio_alsa.$(OBJEXT)
5.189 -@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@am__objects_14 = \
5.190 -@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@ input_lirc.$(OBJEXT)
5.191 -@CDROM_LINUX_TRUE@am__objects_15 = cd_linux.$(OBJEXT)
5.192 -@CDROM_OSX_TRUE@am__objects_16 = cd_osx.$(OBJEXT) osx_iokit.$(OBJEXT)
5.193 -@CDROM_NONE_TRUE@am__objects_17 = cd_none.$(OBJEXT)
5.194 -@JOY_LINUX_TRUE@am__objects_18 = joy_linux.$(OBJEXT)
5.195 -am_lxdream_OBJECTS = main.$(OBJEXT) version.$(OBJEXT) config.$(OBJEXT) \
5.196 +@GUI_COCOA_TRUE@am__objects_2 = paths_osx.$(OBJEXT) io_osx.$(OBJEXT)
5.197 +@GUI_COCOA_FALSE@am__objects_3 = paths_unix.$(OBJEXT) \
5.198 +@GUI_COCOA_FALSE@ io_glib.$(OBJEXT)
5.199 +am_liblxdream_core_a_OBJECTS = version.$(OBJEXT) config.$(OBJEXT) \
5.200 cpu.$(OBJEXT) mem.$(OBJEXT) sdram.$(OBJEXT) watch.$(OBJEXT) \
5.201 asic.$(OBJEXT) syscall.$(OBJEXT) bios.$(OBJEXT) \
5.202 dcload.$(OBJEXT) gdbserver.$(OBJEXT) ioutil.$(OBJEXT) \
5.203 @@ -248,17 +180,93 @@
5.204 cd_nrg.$(OBJEXT) cd_cdi.$(OBJEXT) cd_gdi.$(OBJEXT) \
5.205 edc_ecc.$(OBJEXT) drive.$(OBJEXT) cd_mmc.$(OBJEXT) \
5.206 isofs.$(OBJEXT) isomem.$(OBJEXT) hotkeys.$(OBJEXT) \
5.207 - $(am__objects_1) $(am__objects_2) $(am__objects_3) \
5.208 - $(am__objects_4) $(am__objects_5) $(am__objects_6) \
5.209 - $(am__objects_7) $(am__objects_8) $(am__objects_9) \
5.210 - $(am__objects_10) $(am__objects_11) $(am__objects_12) \
5.211 - $(am__objects_13) $(am__objects_14) $(am__objects_15) \
5.212 - $(am__objects_16) $(am__objects_17) $(am__objects_18)
5.213 + $(am__objects_1) $(am__objects_2) $(am__objects_3)
5.214 +liblxdream_core_a_OBJECTS = $(am_liblxdream_core_a_OBJECTS)
5.215 +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibdir)"
5.216 +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
5.217 +@BUILD_SH4X86_TRUE@am__EXEEXT_1 = test/testsh4x86$(EXEEXT)
5.218 +@BUILD_PLUGINS_TRUE@am__EXEEXT_2 = lxdream_dummy.@SOEXT@$(EXEEXT)
5.219 +@AUDIO_SDL_TRUE@@BUILD_PLUGINS_TRUE@am__EXEEXT_3 = audio_sdl.@SOEXT@$(EXEEXT)
5.220 +@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_TRUE@am__EXEEXT_4 = audio_pulse.@SOEXT@$(EXEEXT)
5.221 +@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_TRUE@am__EXEEXT_5 = audio_esd.@SOEXT@$(EXEEXT)
5.222 +@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_TRUE@am__EXEEXT_6 = audio_alsa.@SOEXT@$(EXEEXT)
5.223 +@BUILD_PLUGINS_TRUE@@INPUT_LIRC_TRUE@am__EXEEXT_7 = input_lirc.@SOEXT@$(EXEEXT)
5.224 +pkglibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
5.225 +PROGRAMS = $(bin_PROGRAMS) $(pkglib_PROGRAMS)
5.226 +am_audio_alsa_@SOEXT@_OBJECTS =
5.227 +audio_alsa_@SOEXT@_OBJECTS = $(am_audio_alsa_@SOEXT@_OBJECTS)
5.228 +@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_TRUE@audio_alsa_@SOEXT@_DEPENDENCIES = \
5.229 +@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_TRUE@ audio_alsa.lo
5.230 +am_audio_esd_@SOEXT@_OBJECTS =
5.231 +audio_esd_@SOEXT@_OBJECTS = $(am_audio_esd_@SOEXT@_OBJECTS)
5.232 +@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_TRUE@audio_esd_@SOEXT@_DEPENDENCIES = \
5.233 +@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_TRUE@ audio_esd.lo
5.234 +am_audio_pulse_@SOEXT@_OBJECTS =
5.235 +audio_pulse_@SOEXT@_OBJECTS = $(am_audio_pulse_@SOEXT@_OBJECTS)
5.236 +@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_TRUE@audio_pulse_@SOEXT@_DEPENDENCIES = \
5.237 +@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_TRUE@ audio_pulse.lo
5.238 +am_audio_sdl_@SOEXT@_OBJECTS =
5.239 +audio_sdl_@SOEXT@_OBJECTS = $(am_audio_sdl_@SOEXT@_OBJECTS)
5.240 +@AUDIO_SDL_TRUE@@BUILD_PLUGINS_TRUE@audio_sdl_@SOEXT@_DEPENDENCIES = \
5.241 +@AUDIO_SDL_TRUE@@BUILD_PLUGINS_TRUE@ audio_sdl.lo
5.242 +am_input_lirc_@SOEXT@_OBJECTS =
5.243 +input_lirc_@SOEXT@_OBJECTS = $(am_input_lirc_@SOEXT@_OBJECTS)
5.244 +@BUILD_PLUGINS_TRUE@@INPUT_LIRC_TRUE@input_lirc_@SOEXT@_DEPENDENCIES = \
5.245 +@BUILD_PLUGINS_TRUE@@INPUT_LIRC_TRUE@ input_lirc.lo
5.246 +am__lxdream_SOURCES_DIST = main.c plugin.c plugin.h gtkui/gtkui.c \
5.247 + gtkui/gtkui.h gtkui/gtk_win.c gtkui/gtkcb.c gtkui/gtk_cfg.c \
5.248 + gtkui/gtk_mmio.c gtkui/gtk_debug.c gtkui/gtk_dump.c \
5.249 + gtkui/gtk_ctrl.c gtkui/gtk_gd.c drivers/video_gtk.c \
5.250 + cocoaui/cocoaui.m cocoaui/cocoaui.h cocoaui/cocoa_cfg.m \
5.251 + cocoaui/cocoa_win.m cocoaui/cocoa_gd.m cocoaui/cocoa_prefs.m \
5.252 + cocoaui/cocoa_ctrl.m drivers/video_osx.m drivers/video_gdk.c \
5.253 + drivers/video_glx.c drivers/video_glx.h drivers/video_nsgl.m \
5.254 + drivers/video_nsgl.h drivers/audio_osx.m drivers/audio_sdl.c \
5.255 + drivers/audio_pulse.c drivers/audio_esd.c drivers/audio_alsa.c \
5.256 + drivers/input_lirc.c drivers/cdrom/cd_linux.c \
5.257 + drivers/cdrom/cd_osx.c drivers/osx_iokit.m drivers/osx_iokit.h \
5.258 + drivers/cdrom/cd_none.c drivers/joy_linux.c \
5.259 + drivers/joy_linux.h
5.260 +@BUILD_PLUGINS_TRUE@am__objects_4 = plugin.$(OBJEXT)
5.261 +@GUI_GTK_TRUE@am__objects_5 = gtkui.$(OBJEXT) gtk_win.$(OBJEXT) \
5.262 +@GUI_GTK_TRUE@ gtkcb.$(OBJEXT) gtk_cfg.$(OBJEXT) \
5.263 +@GUI_GTK_TRUE@ gtk_mmio.$(OBJEXT) gtk_debug.$(OBJEXT) \
5.264 +@GUI_GTK_TRUE@ gtk_dump.$(OBJEXT) gtk_ctrl.$(OBJEXT) \
5.265 +@GUI_GTK_TRUE@ gtk_gd.$(OBJEXT) video_gtk.$(OBJEXT)
5.266 +@GUI_COCOA_TRUE@am__objects_6 = cocoaui.$(OBJEXT) cocoa_cfg.$(OBJEXT) \
5.267 +@GUI_COCOA_TRUE@ cocoa_win.$(OBJEXT) cocoa_gd.$(OBJEXT) \
5.268 +@GUI_COCOA_TRUE@ cocoa_prefs.$(OBJEXT) cocoa_ctrl.$(OBJEXT) \
5.269 +@GUI_COCOA_TRUE@ video_osx.$(OBJEXT)
5.270 +@VIDEO_OSMESA_TRUE@am__objects_7 = video_gdk.$(OBJEXT)
5.271 +@VIDEO_GLX_TRUE@am__objects_8 = video_glx.$(OBJEXT)
5.272 +@VIDEO_NSGL_TRUE@am__objects_9 = video_nsgl.$(OBJEXT)
5.273 +@AUDIO_OSX_TRUE@am__objects_10 = audio_osx.$(OBJEXT)
5.274 +@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@am__objects_11 = \
5.275 +@AUDIO_SDL_TRUE@@BUILD_PLUGINS_FALSE@ audio_sdl.$(OBJEXT)
5.276 +@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@am__objects_12 = \
5.277 +@AUDIO_PULSE_TRUE@@BUILD_PLUGINS_FALSE@ audio_pulse.$(OBJEXT)
5.278 +@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@am__objects_13 = \
5.279 +@AUDIO_ESOUND_TRUE@@BUILD_PLUGINS_FALSE@ audio_esd.$(OBJEXT)
5.280 +@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@am__objects_14 = \
5.281 +@AUDIO_ALSA_TRUE@@BUILD_PLUGINS_FALSE@ audio_alsa.$(OBJEXT)
5.282 +@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@am__objects_15 = \
5.283 +@BUILD_PLUGINS_FALSE@@INPUT_LIRC_TRUE@ input_lirc.$(OBJEXT)
5.284 +@CDROM_LINUX_TRUE@am__objects_16 = cd_linux.$(OBJEXT)
5.285 +@CDROM_OSX_TRUE@am__objects_17 = cd_osx.$(OBJEXT) osx_iokit.$(OBJEXT)
5.286 +@CDROM_NONE_TRUE@am__objects_18 = cd_none.$(OBJEXT)
5.287 +@JOY_LINUX_TRUE@am__objects_19 = joy_linux.$(OBJEXT)
5.288 +am_lxdream_OBJECTS = main.$(OBJEXT) $(am__objects_4) $(am__objects_5) \
5.289 + $(am__objects_6) $(am__objects_7) $(am__objects_8) \
5.290 + $(am__objects_9) $(am__objects_10) $(am__objects_11) \
5.291 + $(am__objects_12) $(am__objects_13) $(am__objects_14) \
5.292 + $(am__objects_15) $(am__objects_16) $(am__objects_17) \
5.293 + $(am__objects_18) $(am__objects_19)
5.294 lxdream_OBJECTS = $(am_lxdream_OBJECTS)
5.295 am__DEPENDENCIES_1 =
5.296 -lxdream_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
5.297 +lxdream_DEPENDENCIES = liblxdream-core.a $(am__DEPENDENCIES_1) \
5.298 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
5.299 - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
5.300 + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
5.301 + $(am__DEPENDENCIES_1)
5.302 am_lxdream_dummy_@SOEXT@_OBJECTS =
5.303 lxdream_dummy_@SOEXT@_OBJECTS = $(am_lxdream_dummy_@SOEXT@_OBJECTS)
5.304 @BUILD_PLUGINS_TRUE@lxdream_dummy_@SOEXT@_DEPENDENCIES = \
5.305 @@ -294,16 +302,17 @@
5.306 OBJCLD = $(OBJC)
5.307 OBJCLINK = $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) $(AM_LDFLAGS) \
5.308 $(LDFLAGS) -o $@
5.309 -SOURCES = $(audio_alsa_@SOEXT@_SOURCES) $(audio_esd_@SOEXT@_SOURCES) \
5.310 - $(audio_pulse_@SOEXT@_SOURCES) $(audio_sdl_@SOEXT@_SOURCES) \
5.311 - $(input_lirc_@SOEXT@_SOURCES) $(lxdream_SOURCES) \
5.312 - $(lxdream_dummy_@SOEXT@_SOURCES) $(test_testlxpaths_SOURCES) \
5.313 - $(test_testsh4x86_SOURCES) $(test_testxlt_SOURCES)
5.314 -DIST_SOURCES = $(audio_alsa_@SOEXT@_SOURCES) \
5.315 +SOURCES = $(liblxdream_core_a_SOURCES) $(audio_alsa_@SOEXT@_SOURCES) \
5.316 $(audio_esd_@SOEXT@_SOURCES) $(audio_pulse_@SOEXT@_SOURCES) \
5.317 $(audio_sdl_@SOEXT@_SOURCES) $(input_lirc_@SOEXT@_SOURCES) \
5.318 - $(am__lxdream_SOURCES_DIST) $(lxdream_dummy_@SOEXT@_SOURCES) \
5.319 - $(test_testlxpaths_SOURCES) \
5.320 + $(lxdream_SOURCES) $(lxdream_dummy_@SOEXT@_SOURCES) \
5.321 + $(test_testlxpaths_SOURCES) $(test_testsh4x86_SOURCES) \
5.322 + $(test_testxlt_SOURCES)
5.323 +DIST_SOURCES = $(am__liblxdream_core_a_SOURCES_DIST) \
5.324 + $(audio_alsa_@SOEXT@_SOURCES) $(audio_esd_@SOEXT@_SOURCES) \
5.325 + $(audio_pulse_@SOEXT@_SOURCES) $(audio_sdl_@SOEXT@_SOURCES) \
5.326 + $(input_lirc_@SOEXT@_SOURCES) $(am__lxdream_SOURCES_DIST) \
5.327 + $(lxdream_dummy_@SOEXT@_SOURCES) $(test_testlxpaths_SOURCES) \
5.328 $(am__test_testsh4x86_SOURCES_DIST) $(test_testxlt_SOURCES)
5.329 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
5.330 html-recursive info-recursive install-data-recursive \
5.331 @@ -445,6 +454,7 @@
5.332 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
5.333 PULSE_CFLAGS = @PULSE_CFLAGS@
5.334 PULSE_LIBS = @PULSE_LIBS@
5.335 +RANLIB = @RANLIB@
5.336 SDL_CFLAGS = @SDL_CFLAGS@
5.337 SDL_LIBS = @SDL_LIBS@
5.338 SED = @SED@
5.339 @@ -534,56 +544,59 @@
5.340 audio_alsa.lo audio_sdl.lo audio_esd.lo audio_pulse.lo input_lirc.lo \
5.341 lxdream_dummy.lo
5.342
5.343 -
5.344 -#all-am: checkversion
5.345 AM_CPPFLAGS = @LXDREAMCPPFLAGS@
5.346 lxdream_LINK = $(LINK) @LXDREAMLDFLAGS@
5.347 -lxdream_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ \
5.348 - @LIBISOFS_LIBS@ $(INTLLIBS) $(am__append_18) $(am__append_20) \
5.349 - $(am__append_22) $(am__append_24) $(am__append_26)
5.350 -lxdream_SOURCES = main.c version.c config.c config.h lxdream.h dream.h \
5.351 - gui.h cpu.c cpu.h hook.h gettext.h mem.c mem.h sdram.c mmio.h \
5.352 - watch.c asic.c asic.h clock.h serial.h syscall.c syscall.h \
5.353 - bios.c dcload.c gdbserver.c ioutil.c ioutil.h lxpaths.c \
5.354 - lxpaths.h gdrom/ide.c gdrom/ide.h gdrom/packet.h gdrom/gdrom.c \
5.355 - gdrom/gdrom.h dreamcast.c dreamcast.h eventq.c eventq.h \
5.356 - sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c sh4/timer.c \
5.357 - sh4/dmac.c sh4/mmu.c sh4/sh4core.c sh4/sh4core.h sh4/sh4dasm.c \
5.358 - sh4/sh4dasm.h sh4/sh4mmio.c sh4/sh4mmio.h sh4/scif.c \
5.359 - sh4/sh4stat.c sh4/sh4stat.h xlat/xltcache.c xlat/xltcache.h \
5.360 - sh4/sh4.h sh4/dmac.h sh4/pmm.c sh4/cache.c sh4/mmu.h \
5.361 - aica/armcore.c aica/armcore.h aica/armdasm.c aica/armdasm.h \
5.362 - aica/armmem.c aica/aica.c aica/aica.h aica/audio.c \
5.363 - aica/audio.h pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c \
5.364 - pvr2/pvr2mmio.h pvr2/tacore.c pvr2/rendsort.c pvr2/tileiter.h \
5.365 - pvr2/shaders.glsl pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c \
5.366 - pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c pvr2/shaders.h \
5.367 - pvr2/shaders.def pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c \
5.368 - maple/maple.c maple/maple.h maple/controller.c maple/kbd.c \
5.369 - maple/mouse.c maple/lightgun.c maple/vmu.c loader.c loader.h \
5.370 - elf.h bootstrap.c bootstrap.h util.c gdlist.c gdlist.h \
5.371 - vmu/vmuvol.c vmu/vmuvol.h vmu/vmulist.c vmu/vmulist.h \
5.372 - display.c display.h dckeysyms.h drivers/audio_null.c \
5.373 - drivers/video_null.c drivers/video_gl.c drivers/video_gl.h \
5.374 - drivers/gl_fbo.c drivers/gl_vbo.c drivers/serial_unix.c \
5.375 - drivers/cdrom/cdrom.h drivers/cdrom/cdrom.c \
5.376 - drivers/cdrom/drive.h drivers/cdrom/sector.h \
5.377 - drivers/cdrom/sector.c drivers/cdrom/defs.h \
5.378 - drivers/cdrom/cd_nrg.c drivers/cdrom/cd_cdi.c \
5.379 - drivers/cdrom/cd_gdi.c drivers/cdrom/edc_ecc.c \
5.380 - drivers/cdrom/ecc.h drivers/cdrom/drive.c \
5.381 - drivers/cdrom/edc_crctable.h drivers/cdrom/edc_encoder.h \
5.382 - drivers/cdrom/cdimpl.h drivers/cdrom/edc_l2sq.h \
5.383 - drivers/cdrom/edc_scramble.h drivers/cdrom/cd_mmc.c \
5.384 - drivers/cdrom/isofs.h drivers/cdrom/isofs.c \
5.385 - drivers/cdrom/isomem.c sh4/sh4.def sh4/sh4core.in \
5.386 - sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in hotkeys.c \
5.387 - hotkeys.h $(am__append_1) $(am__append_2) $(am__append_4) \
5.388 - $(am__append_5) $(am__append_6) $(am__append_7) \
5.389 - $(am__append_8) $(am__append_9) $(am__append_10) \
5.390 - $(am__append_17) $(am__append_19) $(am__append_21) \
5.391 - $(am__append_23) $(am__append_25) $(am__append_27) \
5.392 - $(am__append_28) $(am__append_29) $(am__append_30)
5.393 +lxdream_LDADD = liblxdream-core.a @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ \
5.394 + @LIBISOFS_LIBS@ $(INTLLIBS) @LXDREAM_LIBS@ $(am__append_19) \
5.395 + $(am__append_21) $(am__append_23) $(am__append_25) \
5.396 + $(am__append_27)
5.397 +lxdream_SOURCES = main.c $(am__append_1) $(am__append_4) \
5.398 + $(am__append_6) $(am__append_8) $(am__append_9) \
5.399 + $(am__append_10) $(am__append_11) $(am__append_18) \
5.400 + $(am__append_20) $(am__append_22) $(am__append_24) \
5.401 + $(am__append_26) $(am__append_28) $(am__append_29) \
5.402 + $(am__append_30) $(am__append_31)
5.403 +lxdream_LIBS = liblxdream-core.a
5.404 +noinst_LIBRARIES = liblxdream-core.a
5.405 +liblxdream_core_a_SOURCES = version.c config.c config.h lxdream.h \
5.406 + dream.h gui.h cpu.c cpu.h hook.h gettext.h mem.c mem.h sdram.c \
5.407 + mmio.h watch.c asic.c asic.h clock.h serial.h syscall.c \
5.408 + syscall.h bios.c dcload.c gdbserver.c ioutil.c ioutil.h \
5.409 + lxpaths.c lxpaths.h gdrom/ide.c gdrom/ide.h gdrom/packet.h \
5.410 + gdrom/gdrom.c gdrom/gdrom.h dreamcast.c dreamcast.h eventq.c \
5.411 + eventq.h sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c \
5.412 + sh4/timer.c sh4/dmac.c sh4/mmu.c sh4/sh4core.c sh4/sh4core.h \
5.413 + sh4/sh4dasm.c sh4/sh4dasm.h sh4/sh4mmio.c sh4/sh4mmio.h \
5.414 + sh4/scif.c sh4/sh4stat.c sh4/sh4stat.h xlat/xltcache.c \
5.415 + xlat/xltcache.h sh4/sh4.h sh4/dmac.h sh4/pmm.c sh4/cache.c \
5.416 + sh4/mmu.h aica/armcore.c aica/armcore.h aica/armdasm.c \
5.417 + aica/armdasm.h aica/armmem.c aica/aica.c aica/aica.h \
5.418 + aica/audio.c aica/audio.h pvr2/pvr2.c pvr2/pvr2.h \
5.419 + pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/tacore.c pvr2/rendsort.c \
5.420 + pvr2/tileiter.h pvr2/shaders.glsl pvr2/texcache.c pvr2/yuv.c \
5.421 + pvr2/rendsave.c pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c \
5.422 + pvr2/shaders.h pvr2/shaders.def pvr2/glutil.c pvr2/glutil.h \
5.423 + pvr2/glrender.c maple/maple.c maple/maple.h maple/controller.c \
5.424 + maple/kbd.c maple/mouse.c maple/lightgun.c maple/vmu.c \
5.425 + loader.c loader.h elf.h bootstrap.c bootstrap.h util.c \
5.426 + gdlist.c gdlist.h vmu/vmuvol.c vmu/vmuvol.h vmu/vmulist.c \
5.427 + vmu/vmulist.h display.c display.h dckeysyms.h \
5.428 + drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \
5.429 + drivers/video_gl.h drivers/gl_fbo.c drivers/gl_vbo.c \
5.430 + drivers/serial_unix.c drivers/cdrom/cdrom.h \
5.431 + drivers/cdrom/cdrom.c drivers/cdrom/drive.h \
5.432 + drivers/cdrom/sector.h drivers/cdrom/sector.c \
5.433 + drivers/cdrom/defs.h drivers/cdrom/cd_nrg.c \
5.434 + drivers/cdrom/cd_cdi.c drivers/cdrom/cd_gdi.c \
5.435 + drivers/cdrom/edc_ecc.c drivers/cdrom/ecc.h \
5.436 + drivers/cdrom/drive.c drivers/cdrom/edc_crctable.h \
5.437 + drivers/cdrom/edc_encoder.h drivers/cdrom/cdimpl.h \
5.438 + drivers/cdrom/edc_l2sq.h drivers/cdrom/edc_scramble.h \
5.439 + drivers/cdrom/cd_mmc.c drivers/cdrom/isofs.h \
5.440 + drivers/cdrom/isofs.c drivers/cdrom/isomem.c sh4/sh4.def \
5.441 + sh4/sh4core.in sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in \
5.442 + hotkeys.c hotkeys.h $(am__append_2) $(am__append_5) \
5.443 + $(am__append_7)
5.444 @BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@
5.445 @BUILD_SH4X86_TRUE@test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \
5.446 @BUILD_SH4X86_TRUE@ x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
5.447 @@ -649,6 +662,13 @@
5.448 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5.449 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
5.450 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
5.451 +
5.452 +clean-noinstLIBRARIES:
5.453 + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
5.454 +liblxdream-core.a: $(liblxdream_core_a_OBJECTS) $(liblxdream_core_a_DEPENDENCIES)
5.455 + -rm -f liblxdream-core.a
5.456 + $(liblxdream_core_a_AR) liblxdream-core.a $(liblxdream_core_a_OBJECTS) $(liblxdream_core_a_LIBADD)
5.457 + $(RANLIB) liblxdream-core.a
5.458 install-binPROGRAMS: $(bin_PROGRAMS)
5.459 @$(NORMAL_INSTALL)
5.460 test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
5.461 @@ -1774,6 +1794,20 @@
5.462 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5.463 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o dis-buf.obj `if test -f 'x86dasm/dis-buf.c'; then $(CYGPATH_W) 'x86dasm/dis-buf.c'; else $(CYGPATH_W) '$(srcdir)/x86dasm/dis-buf.c'; fi`
5.464
5.465 +io_glib.o: drivers/io_glib.c
5.466 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT io_glib.o -MD -MP -MF "$(DEPDIR)/io_glib.Tpo" -c -o io_glib.o `test -f 'drivers/io_glib.c' || echo '$(srcdir)/'`drivers/io_glib.c; \
5.467 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/io_glib.Tpo" "$(DEPDIR)/io_glib.Po"; else rm -f "$(DEPDIR)/io_glib.Tpo"; exit 1; fi
5.468 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/io_glib.c' object='io_glib.o' libtool=no @AMDEPBACKSLASH@
5.469 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5.470 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o io_glib.o `test -f 'drivers/io_glib.c' || echo '$(srcdir)/'`drivers/io_glib.c
5.471 +
5.472 +io_glib.obj: drivers/io_glib.c
5.473 +@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT io_glib.obj -MD -MP -MF "$(DEPDIR)/io_glib.Tpo" -c -o io_glib.obj `if test -f 'drivers/io_glib.c'; then $(CYGPATH_W) 'drivers/io_glib.c'; else $(CYGPATH_W) '$(srcdir)/drivers/io_glib.c'; fi`; \
5.474 +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/io_glib.Tpo" "$(DEPDIR)/io_glib.Po"; else rm -f "$(DEPDIR)/io_glib.Tpo"; exit 1; fi
5.475 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/io_glib.c' object='io_glib.obj' libtool=no @AMDEPBACKSLASH@
5.476 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5.477 +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o io_glib.obj `if test -f 'drivers/io_glib.c'; then $(CYGPATH_W) 'drivers/io_glib.c'; else $(CYGPATH_W) '$(srcdir)/drivers/io_glib.c'; fi`
5.478 +
5.479 gtkui.o: gtkui/gtkui.c
5.480 @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gtkui.o -MD -MP -MF "$(DEPDIR)/gtkui.Tpo" -c -o gtkui.o `test -f 'gtkui/gtkui.c' || echo '$(srcdir)/'`gtkui/gtkui.c; \
5.481 @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gtkui.Tpo" "$(DEPDIR)/gtkui.Po"; else rm -f "$(DEPDIR)/gtkui.Tpo"; exit 1; fi
5.482 @@ -1900,20 +1934,6 @@
5.483 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5.484 @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gtk_gd.obj `if test -f 'gtkui/gtk_gd.c'; then $(CYGPATH_W) 'gtkui/gtk_gd.c'; else $(CYGPATH_W) '$(srcdir)/gtkui/gtk_gd.c'; fi`
5.485
5.486 -io_glib.o: drivers/io_glib.c
5.487 -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT io_glib.o -MD -MP -MF "$(DEPDIR)/io_glib.Tpo" -c -o io_glib.o `test -f 'drivers/io_glib.c' || echo '$(srcdir)/'`drivers/io_glib.c; \
5.488 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/io_glib.Tpo" "$(DEPDIR)/io_glib.Po"; else rm -f "$(DEPDIR)/io_glib.Tpo"; exit 1; fi
5.489 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/io_glib.c' object='io_glib.o' libtool=no @AMDEPBACKSLASH@
5.490 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5.491 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o io_glib.o `test -f 'drivers/io_glib.c' || echo '$(srcdir)/'`drivers/io_glib.c
5.492 -
5.493 -io_glib.obj: drivers/io_glib.c
5.494 -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT io_glib.obj -MD -MP -MF "$(DEPDIR)/io_glib.Tpo" -c -o io_glib.obj `if test -f 'drivers/io_glib.c'; then $(CYGPATH_W) 'drivers/io_glib.c'; else $(CYGPATH_W) '$(srcdir)/drivers/io_glib.c'; fi`; \
5.495 -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/io_glib.Tpo" "$(DEPDIR)/io_glib.Po"; else rm -f "$(DEPDIR)/io_glib.Tpo"; exit 1; fi
5.496 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='drivers/io_glib.c' object='io_glib.obj' libtool=no @AMDEPBACKSLASH@
5.497 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5.498 -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o io_glib.obj `if test -f 'drivers/io_glib.c'; then $(CYGPATH_W) 'drivers/io_glib.c'; else $(CYGPATH_W) '$(srcdir)/drivers/io_glib.c'; fi`
5.499 -
5.500 video_gtk.o: drivers/video_gtk.c
5.501 @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT video_gtk.o -MD -MP -MF "$(DEPDIR)/video_gtk.Tpo" -c -o video_gtk.o `test -f 'drivers/video_gtk.c' || echo '$(srcdir)/'`drivers/video_gtk.c; \
5.502 @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/video_gtk.Tpo" "$(DEPDIR)/video_gtk.Po"; else rm -f "$(DEPDIR)/video_gtk.Tpo"; exit 1; fi
5.503 @@ -2138,6 +2158,34 @@
5.504 @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5.505 @am__fastdepOBJC_FALSE@ $(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
5.506
5.507 +paths_osx.o: cocoaui/paths_osx.m
5.508 +@am__fastdepOBJC_TRUE@ if $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT paths_osx.o -MD -MP -MF "$(DEPDIR)/paths_osx.Tpo" -c -o paths_osx.o `test -f 'cocoaui/paths_osx.m' || echo '$(srcdir)/'`cocoaui/paths_osx.m; \
5.509 +@am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/paths_osx.Tpo" "$(DEPDIR)/paths_osx.Po"; else rm -f "$(DEPDIR)/paths_osx.Tpo"; exit 1; fi
5.510 +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='cocoaui/paths_osx.m' object='paths_osx.o' libtool=no @AMDEPBACKSLASH@
5.511 +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5.512 +@am__fastdepOBJC_FALSE@ $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o paths_osx.o `test -f 'cocoaui/paths_osx.m' || echo '$(srcdir)/'`cocoaui/paths_osx.m
5.513 +
5.514 +paths_osx.obj: cocoaui/paths_osx.m
5.515 +@am__fastdepOBJC_TRUE@ if $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT paths_osx.obj -MD -MP -MF "$(DEPDIR)/paths_osx.Tpo" -c -o paths_osx.obj `if test -f 'cocoaui/paths_osx.m'; then $(CYGPATH_W) 'cocoaui/paths_osx.m'; else $(CYGPATH_W) '$(srcdir)/cocoaui/paths_osx.m'; fi`; \
5.516 +@am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/paths_osx.Tpo" "$(DEPDIR)/paths_osx.Po"; else rm -f "$(DEPDIR)/paths_osx.Tpo"; exit 1; fi
5.517 +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='cocoaui/paths_osx.m' object='paths_osx.obj' libtool=no @AMDEPBACKSLASH@
5.518 +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5.519 +@am__fastdepOBJC_FALSE@ $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o paths_osx.obj `if test -f 'cocoaui/paths_osx.m'; then $(CYGPATH_W) 'cocoaui/paths_osx.m'; else $(CYGPATH_W) '$(srcdir)/cocoaui/paths_osx.m'; fi`
5.520 +
5.521 +io_osx.o: drivers/io_osx.m
5.522 +@am__fastdepOBJC_TRUE@ if $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT io_osx.o -MD -MP -MF "$(DEPDIR)/io_osx.Tpo" -c -o io_osx.o `test -f 'drivers/io_osx.m' || echo '$(srcdir)/'`drivers/io_osx.m; \
5.523 +@am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/io_osx.Tpo" "$(DEPDIR)/io_osx.Po"; else rm -f "$(DEPDIR)/io_osx.Tpo"; exit 1; fi
5.524 +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='drivers/io_osx.m' object='io_osx.o' libtool=no @AMDEPBACKSLASH@
5.525 +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5.526 +@am__fastdepOBJC_FALSE@ $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o io_osx.o `test -f 'drivers/io_osx.m' || echo '$(srcdir)/'`drivers/io_osx.m
5.527 +
5.528 +io_osx.obj: drivers/io_osx.m
5.529 +@am__fastdepOBJC_TRUE@ if $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT io_osx.obj -MD -MP -MF "$(DEPDIR)/io_osx.Tpo" -c -o io_osx.obj `if test -f 'drivers/io_osx.m'; then $(CYGPATH_W) 'drivers/io_osx.m'; else $(CYGPATH_W) '$(srcdir)/drivers/io_osx.m'; fi`; \
5.530 +@am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/io_osx.Tpo" "$(DEPDIR)/io_osx.Po"; else rm -f "$(DEPDIR)/io_osx.Tpo"; exit 1; fi
5.531 +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='drivers/io_osx.m' object='io_osx.obj' libtool=no @AMDEPBACKSLASH@
5.532 +@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5.533 +@am__fastdepOBJC_FALSE@ $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o io_osx.obj `if test -f 'drivers/io_osx.m'; then $(CYGPATH_W) 'drivers/io_osx.m'; else $(CYGPATH_W) '$(srcdir)/drivers/io_osx.m'; fi`
5.534 +
5.535 cocoaui.o: cocoaui/cocoaui.m
5.536 @am__fastdepOBJC_TRUE@ if $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT cocoaui.o -MD -MP -MF "$(DEPDIR)/cocoaui.Tpo" -c -o cocoaui.o `test -f 'cocoaui/cocoaui.m' || echo '$(srcdir)/'`cocoaui/cocoaui.m; \
5.537 @am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/cocoaui.Tpo" "$(DEPDIR)/cocoaui.Po"; else rm -f "$(DEPDIR)/cocoaui.Tpo"; exit 1; fi
5.538 @@ -2222,34 +2270,6 @@
5.539 @AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5.540 @am__fastdepOBJC_FALSE@ $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o cocoa_ctrl.obj `if test -f 'cocoaui/cocoa_ctrl.m'; then $(CYGPATH_W) 'cocoaui/cocoa_ctrl.m'; else $(CYGPATH_W) '$(srcdir)/cocoaui/cocoa_ctrl.m'; fi`
5.541
5.542 -paths_osx.o: cocoaui/paths_osx.m
5.543 -@am__fastdepOBJC_TRUE@ if $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT paths_osx.o -MD -MP -MF "$(DEPDIR)/paths_osx.Tpo" -c -o paths_osx.o `test -f 'cocoaui/paths_osx.m' || echo '$(srcdir)/'`cocoaui/paths_osx.m; \
5.544 -@am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/paths_osx.Tpo" "$(DEPDIR)/paths_osx.Po"; else rm -f "$(DEPDIR)/paths_osx.Tpo"; exit 1; fi
5.545 -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='cocoaui/paths_osx.m' object='paths_osx.o' libtool=no @AMDEPBACKSLASH@
5.546 -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5.547 -@am__fastdepOBJC_FALSE@ $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o paths_osx.o `test -f 'cocoaui/paths_osx.m' || echo '$(srcdir)/'`cocoaui/paths_osx.m
5.548 -
5.549 -paths_osx.obj: cocoaui/paths_osx.m
5.550 -@am__fastdepOBJC_TRUE@ if $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT paths_osx.obj -MD -MP -MF "$(DEPDIR)/paths_osx.Tpo" -c -o paths_osx.obj `if test -f 'cocoaui/paths_osx.m'; then $(CYGPATH_W) 'cocoaui/paths_osx.m'; else $(CYGPATH_W) '$(srcdir)/cocoaui/paths_osx.m'; fi`; \
5.551 -@am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/paths_osx.Tpo" "$(DEPDIR)/paths_osx.Po"; else rm -f "$(DEPDIR)/paths_osx.Tpo"; exit 1; fi
5.552 -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='cocoaui/paths_osx.m' object='paths_osx.obj' libtool=no @AMDEPBACKSLASH@
5.553 -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5.554 -@am__fastdepOBJC_FALSE@ $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o paths_osx.obj `if test -f 'cocoaui/paths_osx.m'; then $(CYGPATH_W) 'cocoaui/paths_osx.m'; else $(CYGPATH_W) '$(srcdir)/cocoaui/paths_osx.m'; fi`
5.555 -
5.556 -io_osx.o: drivers/io_osx.m
5.557 -@am__fastdepOBJC_TRUE@ if $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT io_osx.o -MD -MP -MF "$(DEPDIR)/io_osx.Tpo" -c -o io_osx.o `test -f 'drivers/io_osx.m' || echo '$(srcdir)/'`drivers/io_osx.m; \
5.558 -@am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/io_osx.Tpo" "$(DEPDIR)/io_osx.Po"; else rm -f "$(DEPDIR)/io_osx.Tpo"; exit 1; fi
5.559 -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='drivers/io_osx.m' object='io_osx.o' libtool=no @AMDEPBACKSLASH@
5.560 -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5.561 -@am__fastdepOBJC_FALSE@ $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o io_osx.o `test -f 'drivers/io_osx.m' || echo '$(srcdir)/'`drivers/io_osx.m
5.562 -
5.563 -io_osx.obj: drivers/io_osx.m
5.564 -@am__fastdepOBJC_TRUE@ if $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT io_osx.obj -MD -MP -MF "$(DEPDIR)/io_osx.Tpo" -c -o io_osx.obj `if test -f 'drivers/io_osx.m'; then $(CYGPATH_W) 'drivers/io_osx.m'; else $(CYGPATH_W) '$(srcdir)/drivers/io_osx.m'; fi`; \
5.565 -@am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/io_osx.Tpo" "$(DEPDIR)/io_osx.Po"; else rm -f "$(DEPDIR)/io_osx.Tpo"; exit 1; fi
5.566 -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ source='drivers/io_osx.m' object='io_osx.obj' libtool=no @AMDEPBACKSLASH@
5.567 -@AMDEP_TRUE@@am__fastdepOBJC_FALSE@ DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
5.568 -@am__fastdepOBJC_FALSE@ $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -c -o io_osx.obj `if test -f 'drivers/io_osx.m'; then $(CYGPATH_W) 'drivers/io_osx.m'; else $(CYGPATH_W) '$(srcdir)/drivers/io_osx.m'; fi`
5.569 -
5.570 video_osx.o: drivers/video_osx.m
5.571 @am__fastdepOBJC_TRUE@ if $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS) -MT video_osx.o -MD -MP -MF "$(DEPDIR)/video_osx.Tpo" -c -o video_osx.o `test -f 'drivers/video_osx.m' || echo '$(srcdir)/'`drivers/video_osx.m; \
5.572 @am__fastdepOBJC_TRUE@ then mv -f "$(DEPDIR)/video_osx.Tpo" "$(DEPDIR)/video_osx.Po"; else rm -f "$(DEPDIR)/video_osx.Tpo"; exit 1; fi
5.573 @@ -2560,7 +2580,7 @@
5.574 $(MAKE) $(AM_MAKEFLAGS) check-TESTS
5.575 check: $(BUILT_SOURCES)
5.576 $(MAKE) $(AM_MAKEFLAGS) check-recursive
5.577 -all-am: Makefile $(PROGRAMS)
5.578 +all-am: Makefile $(LIBRARIES) $(PROGRAMS)
5.579 installdirs: installdirs-recursive
5.580 installdirs-am:
5.581 for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibdir)"; do \
5.582 @@ -2597,7 +2617,7 @@
5.583 clean: clean-recursive
5.584
5.585 clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
5.586 - clean-pkglibPROGRAMS mostlyclean-am
5.587 + clean-noinstLIBRARIES clean-pkglibPROGRAMS mostlyclean-am
5.588
5.589 distclean: distclean-recursive
5.590 -rm -rf ./$(DEPDIR)
5.591 @@ -2649,18 +2669,19 @@
5.592
5.593 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-TESTS \
5.594 check-am clean clean-binPROGRAMS clean-checkPROGRAMS \
5.595 - clean-generic clean-pkglibPROGRAMS clean-recursive ctags \
5.596 - ctags-recursive distclean distclean-compile distclean-generic \
5.597 - distclean-recursive distclean-tags distdir dvi dvi-am html \
5.598 - html-am info info-am install install-am install-binPROGRAMS \
5.599 - install-data install-data-am install-exec install-exec-am \
5.600 - install-info install-info-am install-man \
5.601 - install-pkglibPROGRAMS install-strip installcheck \
5.602 - installcheck-am installdirs installdirs-am maintainer-clean \
5.603 - maintainer-clean-generic maintainer-clean-recursive \
5.604 - mostlyclean mostlyclean-compile mostlyclean-generic \
5.605 - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
5.606 - uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am \
5.607 + clean-generic clean-noinstLIBRARIES clean-pkglibPROGRAMS \
5.608 + clean-recursive ctags ctags-recursive distclean \
5.609 + distclean-compile distclean-generic distclean-recursive \
5.610 + distclean-tags distdir dvi dvi-am html html-am info info-am \
5.611 + install install-am install-binPROGRAMS install-data \
5.612 + install-data-am install-exec install-exec-am install-info \
5.613 + install-info-am install-man install-pkglibPROGRAMS \
5.614 + install-strip installcheck installcheck-am installdirs \
5.615 + installdirs-am maintainer-clean maintainer-clean-generic \
5.616 + maintainer-clean-recursive mostlyclean mostlyclean-compile \
5.617 + mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
5.618 + tags tags-recursive uninstall uninstall-am \
5.619 + uninstall-binPROGRAMS uninstall-info-am \
5.620 uninstall-pkglibPROGRAMS
5.621
5.622
6.1 --- a/src/tools/Makefile.in Thu Feb 23 08:41:07 2012 +1000
6.2 +++ b/src/tools/Makefile.in Thu Feb 23 08:49:32 2012 +1000
6.3 @@ -201,6 +201,7 @@
6.4 PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
6.5 PULSE_CFLAGS = @PULSE_CFLAGS@
6.6 PULSE_LIBS = @PULSE_LIBS@
6.7 +RANLIB = @RANLIB@
6.8 SDL_CFLAGS = @SDL_CFLAGS@
6.9 SDL_LIBS = @SDL_LIBS@
6.10 SED = @SED@
.