diff -Nurd -x'*~' vice-1.22.orig/configure vice-1.22/configure --- vice-1.22.orig/configure 2007-08-05 15:53:33.000000000 -0400 +++ vice-1.22/configure 2008-03-25 01:08:21.000000000 -0400 @@ -3889,7 +3889,7 @@ if test x"$GCC" = "xyes" ; then warnings_cxx="-Wall -Winline" warnings_c="-Wstrict-prototypes $warnings_cxx" - optimization_c="-O2 -finline-functions" + optimization_c="-O3 -finline-functions" optimization_cxx="-fno-exceptions $optimization_c" if test x"$ac_cv_prog_cc_g" = "xyes" ; then CFLAGS="-g $optimization_c $warnings_c" @@ -6858,6 +6858,8 @@ echo "${ECHO_T}no" >&6 fi +save_libs="$LIBS" +LIBS="$INTLLIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -6908,6 +6910,7 @@ rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext INSTOBJEXT=.mo +LIBS="$save_libs" fi USE_NLS=yes @@ -25533,6 +25536,8 @@ fi +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$X_CFLAGS $CPPFLAGS" echo "$as_me:$LINENO: checking for GL/glx.h" >&5 echo $ECHO_N "checking for GL/glx.h... $ECHO_C" >&6 if test "${ac_cv_header_GL_glx_h+set}" = set; then @@ -25581,7 +25586,7 @@ fi echo "$as_me:$LINENO: result: $ac_cv_header_GL_glx_h" >&5 echo "${ECHO_T}$ac_cv_header_GL_glx_h" >&6 - +CPPFLAGS="$save_CPPFLAGS" if test x"$ac_cv_header_GL_glx_h" = "xyes" ; then echo "$as_me:$LINENO: checking for glXWaitVideoSyncSGI in -lGL" >&5 @@ -27857,6 +27862,19 @@ fi ;; + darwin*) + VICEDIR="$PREFIX/lib/vice"; + + +if true; then + ALTERNATE_DOCDIR_TRUE= + ALTERNATE_DOCDIR_FALSE='#' +else + ALTERNATE_DOCDIR_TRUE='#' + ALTERNATE_DOCDIR_FALSE= +fi + + ;; *) VICEDIR="$PREFIX/lib/vice"; diff -Nurd -x'*~' vice-1.22.orig/configure.in vice-1.22/configure.in --- vice-1.22.orig/configure.in 2007-08-05 15:52:39.000000000 -0400 +++ vice-1.22/configure.in 2008-03-24 02:25:13.000000000 -0400 @@ -331,7 +331,7 @@ if test -z "$user_cflags" ; then if test x"$GCC" = "xyes" ; then warnings_cxx="-Wall -Winline" - warnings_c="-Wstrict-prototypes $warnings_cxx" + warnings_c="$warnings_cxx" optimization_c="-O2 -finline-functions" optimization_cxx="-fno-exceptions $optimization_c" if test x"$ac_cv_prog_cc_g" = "xyes" ; then diff -Nurd -x'*~' vice-1.22.orig/src/Makefile.in vice-1.22/src/Makefile.in --- vice-1.22.orig/src/Makefile.in 2007-08-05 16:45:24.000000000 -0400 +++ vice-1.22/src/Makefile.in 2008-03-24 01:54:47.000000000 -0400 @@ -533,12 +533,12 @@ lib INCLUDES = \ - @ARCH_INCLUDES@ \ - @VICE_ZLIB_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/drive \ - -I$(top_srcdir)/src/vdrive + -I$(top_srcdir)/src/vdrive \ + @ARCH_INCLUDES@ \ + @VICE_ZLIB_INCLUDES@ noinst_HEADERS = \ 6510core.h \ diff -Nurd -x'*~' vice-1.22.orig/src/arch/beos/Makefile.in vice-1.22/src/arch/beos/Makefile.in --- vice-1.22.orig/src/arch/beos/Makefile.in 2007-08-05 16:45:25.000000000 -0400 +++ vice-1.22/src/arch/beos/Makefile.in 2008-03-24 02:00:36.000000000 -0400 @@ -319,7 +319,6 @@ xvic_LDFLAGS = @xvic_LDFLAGS@ SUFFIXES = .def INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/drive \ @@ -330,7 +329,8 @@ -I$(top_srcdir)/src/pet \ -I$(top_srcdir)/src/cbm2 \ -I$(top_srcdir)/src/raster \ - -I$(top_srcdir)/src/sid + -I$(top_srcdir)/src/sid \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libarch.a libarch_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/arch/msdos/Makefile.in vice-1.22/src/arch/msdos/Makefile.in --- vice-1.22.orig/src/arch/msdos/Makefile.in 2007-08-05 16:45:25.000000000 -0400 +++ vice-1.22/src/arch/msdos/Makefile.in 2008-03-24 02:00:29.000000000 -0400 @@ -319,7 +319,6 @@ xvic_LDFLAGS = @xvic_LDFLAGS@ @USE_MIDAS_SOUND_TRUE@libarch_a_LIBADD = vmidas.o INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/drive \ @@ -329,7 +328,8 @@ -I$(top_srcdir)/src/c128 \ -I$(top_srcdir)/src/vic20 \ -I$(top_srcdir)/src/pet \ - -I$(top_srcdir)/src/sid + -I$(top_srcdir)/src/sid \ + @ARCH_INCLUDES@ libarch_a_DEPENDENCIES = @DOS_TFE_PCAP_LIB@ noinst_LIBRARIES = libarch.a diff -Nurd -x'*~' vice-1.22.orig/src/arch/os2/Makefile.in vice-1.22/src/arch/os2/Makefile.in --- vice-1.22.orig/src/arch/os2/Makefile.in 2007-08-05 16:45:25.000000000 -0400 +++ vice-1.22/src/arch/os2/Makefile.in 2008-03-24 02:00:20.000000000 -0400 @@ -317,10 +317,10 @@ xvic_LDFLAGS = @xvic_LDFLAGS@ SUBDIRS = snippets vac++ kbd dialogs INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/drive + -I$(top_srcdir)/src/drive \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libarch.a libarch_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/arch/riscos/Makefile.in vice-1.22/src/arch/riscos/Makefile.in --- vice-1.22.orig/src/arch/riscos/Makefile.in 2007-08-05 16:45:26.000000000 -0400 +++ vice-1.22/src/arch/riscos/Makefile.in 2008-03-24 02:00:09.000000000 -0400 @@ -309,14 +309,14 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/drive \ -I$(top_srcdir)/src/c64 \ -I$(top_srcdir)/src/c128 \ -I$(top_srcdir)/src/vic20 \ - -I$(top_srcdir)/src/pet + -I$(top_srcdir)/src/pet \ + @ARCH_INCLUDES@ noinst_LIBRARIES = \ libarch.a diff -Nurd -x'*~' vice-1.22.orig/src/arch/unix/Makefile.in vice-1.22/src/arch/unix/Makefile.in --- vice-1.22.orig/src/arch/unix/Makefile.in 2007-08-05 16:45:27.000000000 -0400 +++ vice-1.22/src/arch/unix/Makefile.in 2008-03-24 01:59:07.000000000 -0400 @@ -325,7 +325,6 @@ @MACOSX_COCOA_FALSE@@UNIX_GP2X_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_FALSE@SUBDIRS = gp2x @MACOSX_COCOA_TRUE@SUBDIRS = macosx INCLUDES = \ - @ARCH_INCLUDES@ \ @FFMPEG_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src/drive \ @@ -335,7 +334,8 @@ -I$(top_srcdir)/src/pet \ -I$(top_srcdir)/src/cbm2 \ -I$(top_srcdir)/src/sid \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libarch.a libarch_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/arch/unix/archdep.h vice-1.22/src/arch/unix/archdep.h --- vice-1.22.orig/src/arch/unix/archdep.h 2007-04-29 14:50:17.000000000 -0400 +++ vice-1.22/src/arch/unix/archdep.h 2008-03-24 00:59:57.000000000 -0400 @@ -112,7 +112,7 @@ #define LIBDIR PREFIX "/lib/vice" #endif -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) #define DOCDIR PREFIX "/share/doc/vice" #else #define DOCDIR LIBDIR "/doc" diff -Nurd -x'*~' vice-1.22.orig/src/arch/unix/gp2x/Makefile.in vice-1.22/src/arch/unix/gp2x/Makefile.in --- vice-1.22.orig/src/arch/unix/gp2x/Makefile.in 2007-08-05 16:45:27.000000000 -0400 +++ vice-1.22/src/arch/unix/gp2x/Makefile.in 2008-03-24 01:59:57.000000000 -0400 @@ -309,7 +309,6 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src/drive \ -I$(top_srcdir)/src/c64 \ @@ -318,7 +317,8 @@ -I$(top_srcdir)/src/pet \ -I$(top_srcdir)/src/cbm2 \ -I$(top_srcdir)/src/sid \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libarchgp2x.a libarchgp2x_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/arch/unix/gui/Makefile.in vice-1.22/src/arch/unix/gui/Makefile.in --- vice-1.22.orig/src/arch/unix/gui/Makefile.in 2007-08-05 16:45:27.000000000 -0400 +++ vice-1.22/src/arch/unix/gui/Makefile.in 2008-03-24 01:59:51.000000000 -0400 @@ -327,7 +327,6 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ @FFMPEG_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src/drive \ @@ -337,7 +336,8 @@ -I$(top_srcdir)/src/pet \ -I$(top_srcdir)/src/cbm2 \ -I$(top_srcdir)/src/sid \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libarchgui.a libarchgui_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/arch/unix/macosx/Makefile.in vice-1.22/src/arch/unix/macosx/Makefile.in --- vice-1.22.orig/src/arch/unix/macosx/Makefile.in 2007-08-05 16:45:27.000000000 -0400 +++ vice-1.22/src/arch/unix/macosx/Makefile.in 2008-03-24 01:59:21.000000000 -0400 @@ -311,7 +311,6 @@ xvic_LDFLAGS = @xvic_LDFLAGS@ @MACOSX_COCOA_TRUE@SUBDIRS = cocoa Resources INCLUDES = \ - @ARCH_INCLUDES@ \ @FFMPEG_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src/drive \ @@ -321,7 +320,8 @@ -I$(top_srcdir)/src/pet \ -I$(top_srcdir)/src/cbm2 \ -I$(top_srcdir)/src/sid \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libarchmacosx.a libarchmacosx_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/arch/unix/macosx/cocoa/Makefile.in vice-1.22/src/arch/unix/macosx/cocoa/Makefile.in --- vice-1.22.orig/src/arch/unix/macosx/cocoa/Makefile.in 2007-08-05 16:45:28.000000000 -0400 +++ vice-1.22/src/arch/unix/macosx/cocoa/Makefile.in 2008-03-24 01:59:41.000000000 -0400 @@ -324,7 +324,6 @@ xvic_LDFLAGS = @xvic_LDFLAGS@ SUBDIRS = view menu dialog INCLUDES = \ - @ARCH_INCLUDES@ \ @FFMPEG_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src/drive \ @@ -336,7 +335,8 @@ -I$(top_srcdir)/src/sid \ -I$(top_srcdir)/src/vdrive \ -I$(top_srcdir)/src/raster \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libarchmacosxcocoa.a noinst_HEADERS = \ diff -Nurd -x'*~' vice-1.22.orig/src/arch/unix/macosx/cocoa/dialog/Makefile.in vice-1.22/src/arch/unix/macosx/cocoa/dialog/Makefile.in --- vice-1.22.orig/src/arch/unix/macosx/cocoa/dialog/Makefile.in 2007-08-05 16:45:28.000000000 -0400 +++ vice-1.22/src/arch/unix/macosx/cocoa/dialog/Makefile.in 2008-03-24 01:59:46.000000000 -0400 @@ -312,7 +312,6 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ @FFMPEG_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src/drive \ @@ -324,7 +323,8 @@ -I$(top_srcdir)/src/sid \ -I$(top_srcdir)/src/vdrive \ -I$(top_srcdir)/src/raster \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libarchmacosxcocoadialog.a noinst_HEADERS = \ diff -Nurd -x'*~' vice-1.22.orig/src/arch/unix/macosx/cocoa/menu/Makefile.in vice-1.22/src/arch/unix/macosx/cocoa/menu/Makefile.in --- vice-1.22.orig/src/arch/unix/macosx/cocoa/menu/Makefile.in 2007-08-05 16:45:28.000000000 -0400 +++ vice-1.22/src/arch/unix/macosx/cocoa/menu/Makefile.in 2008-03-24 01:59:35.000000000 -0400 @@ -313,7 +313,6 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ @FFMPEG_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src/drive \ @@ -325,7 +324,8 @@ -I$(top_srcdir)/src/sid \ -I$(top_srcdir)/src/vdrive \ -I$(top_srcdir)/src/raster \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libarchmacosxcocoamenu.a noinst_HEADERS = \ diff -Nurd -x'*~' vice-1.22.orig/src/arch/unix/macosx/cocoa/view/Makefile.in vice-1.22/src/arch/unix/macosx/cocoa/view/Makefile.in --- vice-1.22.orig/src/arch/unix/macosx/cocoa/view/Makefile.in 2007-08-05 16:45:29.000000000 -0400 +++ vice-1.22/src/arch/unix/macosx/cocoa/view/Makefile.in 2008-03-24 01:59:27.000000000 -0400 @@ -312,7 +312,6 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ @FFMPEG_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src/drive \ @@ -324,7 +323,8 @@ -I$(top_srcdir)/src/sid \ -I$(top_srcdir)/src/vdrive \ -I$(top_srcdir)/src/raster \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libarchmacosxcocoaview.a noinst_HEADERS = \ diff -Nurd -x'*~' vice-1.22.orig/src/arch/unix/readline/Makefile.in vice-1.22/src/arch/unix/readline/Makefile.in --- vice-1.22.orig/src/arch/unix/readline/Makefile.in 2007-08-05 16:45:29.000000000 -0400 +++ vice-1.22/src/arch/unix/readline/Makefile.in 2008-03-24 01:58:59.000000000 -0400 @@ -304,9 +304,9 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libreadline.a libreadline_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/arch/unix/x11/Makefile.in vice-1.22/src/arch/unix/x11/Makefile.in --- vice-1.22.orig/src/arch/unix/x11/Makefile.in 2007-08-05 16:45:29.000000000 -0400 +++ vice-1.22/src/arch/unix/x11/Makefile.in 2008-03-24 01:58:50.000000000 -0400 @@ -316,10 +316,10 @@ @GNOMEUI_FALSE@SUBDIRS = xaw @GNOMEUI_TRUE@SUBDIRS = gnome INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/arch/unix/gui + -I$(top_srcdir)/src/arch/unix/gui \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libx11ui.a EXTRA_libx11ui_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/arch/unix/x11/gnome/Makefile.in vice-1.22/src/arch/unix/x11/gnome/Makefile.in --- vice-1.22.orig/src/arch/unix/x11/gnome/Makefile.in 2007-08-05 16:45:29.000000000 -0400 +++ vice-1.22/src/arch/unix/x11/gnome/Makefile.in 2008-03-24 01:58:55.000000000 -0400 @@ -306,11 +306,11 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/arch/unix/gui \ - -I$(top_srcdir)/src/arch/unix/x11 + -I$(top_srcdir)/src/arch/unix/x11 \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libgnomeui.a libgnomeui_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/arch/unix/x11/xaw/Makefile.in vice-1.22/src/arch/unix/x11/xaw/Makefile.in --- vice-1.22.orig/src/arch/unix/x11/xaw/Makefile.in 2007-08-05 16:45:29.000000000 -0400 +++ vice-1.22/src/arch/unix/x11/xaw/Makefile.in 2008-03-24 01:58:43.000000000 -0400 @@ -313,7 +313,6 @@ xvic_LDFLAGS = @xvic_LDFLAGS@ SUBDIRS = widgets INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/drive \ @@ -324,7 +323,8 @@ -I$(top_srcdir)/src/pet \ -I$(top_srcdir)/src/cbm2 \ -I$(top_srcdir)/src/arch/unix/gui \ - -I$(top_srcdir)/src/arch/unix/x11 + -I$(top_srcdir)/src/arch/unix/x11 \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libxawui.a libxawui_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/arch/unix/x11/xaw/widgets/Makefile.in vice-1.22/src/arch/unix/x11/xaw/widgets/Makefile.in --- vice-1.22.orig/src/arch/unix/x11/xaw/widgets/Makefile.in 2007-08-05 16:45:30.000000000 -0400 +++ vice-1.22/src/arch/unix/x11/xaw/widgets/Makefile.in 2008-03-24 01:58:37.000000000 -0400 @@ -305,11 +305,11 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ -I$(top_srcdir)/src/arch/unix/x11 \ - -I$(top_srcdir)/src/arch/unix/x11/xaw + -I$(top_srcdir)/src/arch/unix/x11/xaw \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libwidgets.a libwidgets_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/c128/Makefile.in vice-1.22/src/c128/Makefile.in --- vice-1.22.orig/src/c128/Makefile.in 2007-08-05 16:45:30.000000000 -0400 +++ vice-1.22/src/c128/Makefile.in 2008-03-24 01:57:46.000000000 -0400 @@ -309,7 +309,6 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/drive \ @@ -317,7 +316,8 @@ -I$(top_srcdir)/src/sid \ -I$(top_srcdir)/src/tape \ -I$(top_srcdir)/src/vicii \ - -I$(top_srcdir)/src/vdc + -I$(top_srcdir)/src/vdc \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libc128.a libc128_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/c64/Makefile.in vice-1.22/src/c64/Makefile.in --- vice-1.22.orig/src/c64/Makefile.in 2007-08-05 16:45:30.000000000 -0400 +++ vice-1.22/src/c64/Makefile.in 2008-03-24 01:57:36.000000000 -0400 @@ -334,13 +334,13 @@ xvic_LDFLAGS = @xvic_LDFLAGS@ SUBDIRS = cart INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/drive \ -I$(top_srcdir)/src/sid \ -I$(top_srcdir)/src/tape \ - -I$(top_srcdir)/src/vicii + -I$(top_srcdir)/src/vicii \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libc64.a libc64c128.a libc64_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/c64/cart/Makefile.in vice-1.22/src/c64/cart/Makefile.in --- vice-1.22.orig/src/c64/cart/Makefile.in 2007-08-05 16:45:31.000000000 -0400 +++ vice-1.22/src/c64/cart/Makefile.in 2008-03-24 01:57:42.000000000 -0400 @@ -309,11 +309,11 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/c64 \ - -I$(top_srcdir)/src/vicii + -I$(top_srcdir)/src/vicii \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libc64cart.a libc64cart_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/cbm2/Makefile.in vice-1.22/src/cbm2/Makefile.in --- vice-1.22.orig/src/cbm2/Makefile.in 2007-08-05 16:45:31.000000000 -0400 +++ vice-1.22/src/cbm2/Makefile.in 2008-03-24 01:57:32.000000000 -0400 @@ -308,14 +308,14 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/sid \ -I$(top_srcdir)/src/crtc \ -I$(top_srcdir)/src/vicii \ -I$(top_srcdir)/src/drive \ - -I$(top_srcdir)/src/tape + -I$(top_srcdir)/src/tape \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libcbm2.a libcbm2_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/core/Makefile.in vice-1.22/src/core/Makefile.in --- vice-1.22.orig/src/core/Makefile.in 2007-08-05 16:45:31.000000000 -0400 +++ vice-1.22/src/core/Makefile.in 2008-03-24 01:57:28.000000000 -0400 @@ -302,9 +302,9 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libcore.a libcore_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/crtc/Makefile.in vice-1.22/src/crtc/Makefile.in --- vice-1.22.orig/src/crtc/Makefile.in 2007-08-05 16:45:31.000000000 -0400 +++ vice-1.22/src/crtc/Makefile.in 2008-03-24 01:57:24.000000000 -0400 @@ -304,10 +304,10 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/raster + -I$(top_srcdir)/src/raster \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libcrtc.a libcrtc_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/diskimage/Makefile.in vice-1.22/src/diskimage/Makefile.in --- vice-1.22.orig/src/diskimage/Makefile.in 2007-08-05 16:45:32.000000000 -0400 +++ vice-1.22/src/diskimage/Makefile.in 2008-03-24 01:57:19.000000000 -0400 @@ -304,9 +304,9 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libdiskimage.a EXTRA_libdiskimage_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/drive/Makefile.in vice-1.22/src/drive/Makefile.in --- vice-1.22.orig/src/drive/Makefile.in 2007-08-05 16:45:32.000000000 -0400 +++ vice-1.22/src/drive/Makefile.in 2008-03-24 01:56:43.000000000 -0400 @@ -320,10 +320,10 @@ tcbm INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/vdrive + -I$(top_srcdir)/src/vdrive \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libdrive.a libdrive_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/drive/iec/Makefile.in vice-1.22/src/drive/iec/Makefile.in --- vice-1.22.orig/src/drive/iec/Makefile.in 2007-08-05 16:45:32.000000000 -0400 +++ vice-1.22/src/drive/iec/Makefile.in 2008-03-24 01:57:11.000000000 -0400 @@ -315,10 +315,10 @@ plus4exp INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/drive + -I$(top_srcdir)/src/drive \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libdriveiec.a libdriveiec_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/drive/iec/c64exp/Makefile.in vice-1.22/src/drive/iec/c64exp/Makefile.in --- vice-1.22.orig/src/drive/iec/c64exp/Makefile.in 2007-08-05 16:45:32.000000000 -0400 +++ vice-1.22/src/drive/iec/c64exp/Makefile.in 2008-03-24 01:57:16.000000000 -0400 @@ -303,11 +303,11 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/drive \ - -I$(top_srcdir)/src/drive/iec + -I$(top_srcdir)/src/drive/iec \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libdriveiecc64exp.a libdriveiecc64exp_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/drive/iec/plus4exp/Makefile.in vice-1.22/src/drive/iec/plus4exp/Makefile.in --- vice-1.22.orig/src/drive/iec/plus4exp/Makefile.in 2007-08-05 16:45:32.000000000 -0400 +++ vice-1.22/src/drive/iec/plus4exp/Makefile.in 2008-03-24 01:57:03.000000000 -0400 @@ -303,11 +303,11 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/drive \ - -I$(top_srcdir)/src/drive/iec + -I$(top_srcdir)/src/drive/iec \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libdriveiecplus4exp.a libdriveiecplus4exp_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/drive/iec128dcr/Makefile.in vice-1.22/src/drive/iec128dcr/Makefile.in --- vice-1.22.orig/src/drive/iec128dcr/Makefile.in 2007-08-05 16:45:33.000000000 -0400 +++ vice-1.22/src/drive/iec128dcr/Makefile.in 2008-03-24 01:56:59.000000000 -0400 @@ -303,10 +303,10 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/drive + -I$(top_srcdir)/src/drive \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libdriveiec128dcr.a libdriveiec128dcr_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/drive/iecieee/Makefile.in vice-1.22/src/drive/iecieee/Makefile.in --- vice-1.22.orig/src/drive/iecieee/Makefile.in 2007-08-05 16:45:33.000000000 -0400 +++ vice-1.22/src/drive/iecieee/Makefile.in 2008-03-24 01:56:54.000000000 -0400 @@ -301,10 +301,10 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/drive + -I$(top_srcdir)/src/drive \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libdriveiecieee.a libdriveiecieee_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/drive/ieee/Makefile.in vice-1.22/src/drive/ieee/Makefile.in --- vice-1.22.orig/src/drive/ieee/Makefile.in 2007-08-05 16:45:33.000000000 -0400 +++ vice-1.22/src/drive/ieee/Makefile.in 2008-03-24 01:56:49.000000000 -0400 @@ -304,10 +304,10 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/drive + -I$(top_srcdir)/src/drive \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libdriveieee.a libdriveieee_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/drive/tcbm/Makefile.in vice-1.22/src/drive/tcbm/Makefile.in --- vice-1.22.orig/src/drive/tcbm/Makefile.in 2007-08-05 16:45:33.000000000 -0400 +++ vice-1.22/src/drive/tcbm/Makefile.in 2008-03-24 01:56:38.000000000 -0400 @@ -303,10 +303,10 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/drive + -I$(top_srcdir)/src/drive \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libdrivetcbm.a libdrivetcbm_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/fileio/Makefile.in vice-1.22/src/fileio/Makefile.in --- vice-1.22.orig/src/fileio/Makefile.in 2007-08-05 16:45:33.000000000 -0400 +++ vice-1.22/src/fileio/Makefile.in 2008-03-24 01:56:34.000000000 -0400 @@ -302,9 +302,9 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libfileio.a libfileio_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/fsdevice/Makefile.in vice-1.22/src/fsdevice/Makefile.in --- vice-1.22.orig/src/fsdevice/Makefile.in 2007-08-05 16:45:34.000000000 -0400 +++ vice-1.22/src/fsdevice/Makefile.in 2008-03-24 01:56:29.000000000 -0400 @@ -305,10 +305,10 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/vdrive + -I$(top_srcdir)/src/vdrive \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libfsdevice.a libfsdevice_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/gfxoutputdrv/Makefile.in vice-1.22/src/gfxoutputdrv/Makefile.in --- vice-1.22.orig/src/gfxoutputdrv/Makefile.in 2007-08-05 16:45:34.000000000 -0400 +++ vice-1.22/src/gfxoutputdrv/Makefile.in 2008-03-24 01:56:23.000000000 -0400 @@ -305,12 +305,12 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ @VICE_LIBPNG_INCLUDES@ \ @VICE_ZLIB_INCLUDES@ \ @FFMPEG_INCLUDES@ \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libgfxoutputdrv.a diff -Nurd -x'*~' vice-1.22.orig/src/iecbus/Makefile.in vice-1.22/src/iecbus/Makefile.in --- vice-1.22.orig/src/iecbus/Makefile.in 2007-08-05 16:45:34.000000000 -0400 +++ vice-1.22/src/iecbus/Makefile.in 2008-03-24 01:54:58.000000000 -0400 @@ -301,10 +301,10 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/drive + -I$(top_srcdir)/src/drive \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libiecbus.a libiecbus_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/imagecontents/Makefile.in vice-1.22/src/imagecontents/Makefile.in --- vice-1.22.orig/src/imagecontents/Makefile.in 2007-08-05 16:45:34.000000000 -0400 +++ vice-1.22/src/imagecontents/Makefile.in 2008-03-24 01:54:54.000000000 -0400 @@ -303,10 +303,10 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/vdrive + -I$(top_srcdir)/src/vdrive \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libimagecontents.a libimagecontents_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/monitor/Makefile.in vice-1.22/src/monitor/Makefile.in --- vice-1.22.orig/src/monitor/Makefile.in 2007-08-05 16:45:35.000000000 -0400 +++ vice-1.22/src/monitor/Makefile.in 2008-03-24 01:54:38.000000000 -0400 @@ -313,11 +313,11 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/drive \ - -I$(top_srcdir)/src/vdrive + -I$(top_srcdir)/src/vdrive \ + @ARCH_INCLUDES@ YFLAGS = -dt noinst_LIBRARIES = libmonitor.a diff -Nurd -x'*~' vice-1.22.orig/src/network.c vice-1.22/src/network.c --- vice-1.22.orig/src/network.c 2007-07-15 18:49:24.000000000 -0400 +++ vice-1.22/src/network.c 2008-03-24 00:58:43.000000000 -0400 @@ -152,7 +152,7 @@ static int suspended; static char *server_name = NULL; -static unsigned short server_port; +static unsigned int server_port; static int res_server_port; static int frame_delta; static int network_control; diff -Nurd -x'*~' vice-1.22.orig/src/parallel/Makefile.in vice-1.22/src/parallel/Makefile.in --- vice-1.22.orig/src/parallel/Makefile.in 2007-08-05 16:45:35.000000000 -0400 +++ vice-1.22/src/parallel/Makefile.in 2008-03-24 01:54:34.000000000 -0400 @@ -301,10 +301,10 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/drive + -I$(top_srcdir)/src/drive \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libparallel.a libparallel_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/pet/Makefile.in vice-1.22/src/pet/Makefile.in --- vice-1.22.orig/src/pet/Makefile.in 2007-08-05 16:45:36.000000000 -0400 +++ vice-1.22/src/pet/Makefile.in 2008-03-24 01:54:29.000000000 -0400 @@ -308,13 +308,13 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/crtc \ -I$(top_srcdir)/src/drive \ -I$(top_srcdir)/src/sid \ - -I$(top_srcdir)/src/tape + -I$(top_srcdir)/src/tape \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libpet.a libpet_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/plus4/Makefile.in vice-1.22/src/plus4/Makefile.in --- vice-1.22.orig/src/plus4/Makefile.in 2007-08-05 16:45:36.000000000 -0400 +++ vice-1.22/src/plus4/Makefile.in 2008-03-24 01:54:22.000000000 -0400 @@ -317,13 +317,13 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/drive \ -I$(top_srcdir)/src/sid \ -I$(top_srcdir)/src/tape \ - -I$(top_srcdir)/src/raster + -I$(top_srcdir)/src/raster \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libplus4.a libplus4_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/printerdrv/Makefile.in vice-1.22/src/printerdrv/Makefile.in --- vice-1.22.orig/src/printerdrv/Makefile.in 2007-08-05 16:45:36.000000000 -0400 +++ vice-1.22/src/printerdrv/Makefile.in 2008-03-24 01:54:13.000000000 -0400 @@ -306,9 +306,9 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libprinterdrv.a libprinterdrv_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/raster/Makefile.in vice-1.22/src/raster/Makefile.in --- vice-1.22.orig/src/raster/Makefile.in 2007-08-05 16:45:36.000000000 -0400 +++ vice-1.22/src/raster/Makefile.in 2008-03-24 01:54:08.000000000 -0400 @@ -308,9 +308,9 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libraster.a libraster_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/rs232drv/Makefile.in vice-1.22/src/rs232drv/Makefile.in --- vice-1.22.orig/src/rs232drv/Makefile.in 2007-08-05 16:45:36.000000000 -0400 +++ vice-1.22/src/rs232drv/Makefile.in 2008-03-24 01:54:03.000000000 -0400 @@ -301,9 +301,9 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = librs232drv.a librs232drv_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/serial/Makefile.in vice-1.22/src/serial/Makefile.in --- vice-1.22.orig/src/serial/Makefile.in 2007-08-05 16:45:37.000000000 -0400 +++ vice-1.22/src/serial/Makefile.in 2008-03-24 01:53:53.000000000 -0400 @@ -304,10 +304,10 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/drive + -I$(top_srcdir)/src/drive \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libserial.a EXTRA_libserial_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/sid/Makefile.in vice-1.22/src/sid/Makefile.in --- vice-1.22.orig/src/sid/Makefile.in 2007-08-05 16:45:37.000000000 -0400 +++ vice-1.22/src/sid/Makefile.in 2008-03-24 01:53:45.000000000 -0400 @@ -311,10 +311,10 @@ @HAVE_RESID_TRUE@resid_libadd = resid.o SUFFIXES = .def INCLUDES = \ - @ARCH_INCLUDES@ \ @RESID_INCLUDES@ \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libsid.a libsid_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/sounddrv/Makefile.in vice-1.22/src/sounddrv/Makefile.in --- vice-1.22.orig/src/sounddrv/Makefile.in 2007-08-05 16:45:37.000000000 -0400 +++ vice-1.22/src/sounddrv/Makefile.in 2008-03-24 01:51:29.000000000 -0400 @@ -309,9 +309,9 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libsounddrv.a diff -Nurd -x'*~' vice-1.22.orig/src/tape/Makefile.in vice-1.22/src/tape/Makefile.in --- vice-1.22.orig/src/tape/Makefile.in 2007-08-05 16:45:37.000000000 -0400 +++ vice-1.22/src/tape/Makefile.in 2008-03-24 01:53:36.000000000 -0400 @@ -303,9 +303,9 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libtape.a libtape_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/vdc/Makefile.in vice-1.22/src/vdc/Makefile.in --- vice-1.22.orig/src/vdc/Makefile.in 2007-08-05 16:45:37.000000000 -0400 +++ vice-1.22/src/vdc/Makefile.in 2008-03-24 01:53:30.000000000 -0400 @@ -303,10 +303,10 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/raster + -I$(top_srcdir)/src/raster \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libvdc.a libvdc_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/vdrive/Makefile.in vice-1.22/src/vdrive/Makefile.in --- vice-1.22.orig/src/vdrive/Makefile.in 2007-08-05 16:45:38.000000000 -0400 +++ vice-1.22/src/vdrive/Makefile.in 2008-03-24 01:53:24.000000000 -0400 @@ -304,9 +304,9 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libvdrive.a libvdrive_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/vic20/Makefile.in vice-1.22/src/vic20/Makefile.in --- vice-1.22.orig/src/vic20/Makefile.in 2007-08-05 16:45:38.000000000 -0400 +++ vice-1.22/src/vic20/Makefile.in 2008-03-24 01:53:17.000000000 -0400 @@ -313,13 +313,13 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/drive \ -I$(top_srcdir)/src/sid \ -I$(top_srcdir)/src/tape \ - -I$(top_srcdir)/src/raster + -I$(top_srcdir)/src/raster \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libvic20.a libvic20_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/vicii/Makefile.in vice-1.22/src/vicii/Makefile.in --- vice-1.22.orig/src/vicii/Makefile.in 2007-08-05 16:45:38.000000000 -0400 +++ vice-1.22/src/vicii/Makefile.in 2008-03-24 01:53:09.000000000 -0400 @@ -307,11 +307,11 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/raster \ - -I$(top_srcdir)/src/c64 + -I$(top_srcdir)/src/c64 \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libvicii.a libvicii_a_SOURCES = \ diff -Nurd -x'*~' vice-1.22.orig/src/video/Makefile.in vice-1.22/src/video/Makefile.in --- vice-1.22.orig/src/video/Makefile.in 2007-08-05 16:45:38.000000000 -0400 +++ vice-1.22/src/video/Makefile.in 2008-03-24 01:52:57.000000000 -0400 @@ -308,10 +308,10 @@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ INCLUDES = \ - @ARCH_INCLUDES@ \ -I$(top_builddir)/src \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/raster + -I$(top_srcdir)/src/raster \ + @ARCH_INCLUDES@ noinst_LIBRARIES = libvideo.a libvideo_a_SOURCES = \