--- SheepShaver/Makefile	2004/07/10 07:38:50	1.14
+++ SheepShaver/Makefile	2010/10/19 22:20:01	1.35
@@ -1,14 +1,15 @@
 # Makefile for creating SheepShaver distributions
 # Written in 1999 by Christian Bauer <Christian.Bauer@uni-mainz.de>
 
-VERSION := 2
-RELEASE := 2
+VERSION := 2.3
 VERNAME := SheepShaver-$(VERSION)
+CVSDATE := $(shell date "+%Y%m%d")
 
-SRCARCHIVE := $(shell date +SheepShaver_src_%d%m%Y.tar.gz)
+SRCARCHIVE := $(VERNAME)-$(CVSDATE).tar.gz
 
 TMPDIR := $(shell date +/tmp/build%m%s)
-DOCS := HISTORY LOG TODO
+ISODATE := $(shell date "+%Y-%m-%d %H:%M")
+DOCS := NEWS
 SRCS := src
 
 # Where Basilisk II directory can be found
@@ -33,9 +34,13 @@ tarball: $(SRCARCHIVE)
 $(SRCARCHIVE): $(SRCS) $(DOCS)
 	-rm -rf $(TMPDIR)
 	mkdir $(TMPDIR)
-	cd $(TMPDIR); cvs export -D "$(ISODATE)" SheepShaver
+	cd $(TMPDIR); cvs export -D "$(ISODATE)" BasiliskII SheepShaver
+	cd $(TMPDIR)/SheepShaver/src/Unix && mkdir Darwin
+	cd $(TMPDIR)/SheepShaver && make links
+	cd $(TMPDIR)/SheepShaver/src/Unix && NO_CONFIGURE=1 ./autogen.sh
+	cd $(TMPDIR)/SheepShaver/src/Windows && NO_CONFIGURE=1 ../Unix/autogen.sh
 	rm $(TMPDIR)/SheepShaver/Makefile
-	mv $(TMPDIR)/SheepShaver $(TMPDIR)/$(VERNAME)
+	cp -aL $(TMPDIR)/SheepShaver $(TMPDIR)/$(VERNAME)
 	cd $(TMPDIR); tar cfz $@ $(VERNAME)
 	mv $(TMPDIR)/$@ .
 	rm -rf $(TMPDIR)
@@ -54,22 +59,42 @@ links:
 	       BeOS/audio_beos.cpp BeOS/extfs_beos.cpp BeOS/scsi_beos.cpp \
 	       BeOS/serial_beos.cpp BeOS/sys_beos.cpp BeOS/timer_beos.cpp \
 	       BeOS/xpram_beos.cpp BeOS/SheepDriver BeOS/SheepNet \
-	       Unix/audio_oss_esd.cpp Unix/extfs_unix.cpp Unix/serial_unix.cpp \
+	       Unix/audio_oss_esd.cpp Unix/bincue_unix.cpp Unix/bincue_unix.h \
+           Unix/vhd_unix.cpp Unix/vhd_unix.h \
+	       Unix/extfs_unix.cpp Unix/serial_unix.cpp \
 	       Unix/sshpty.h Unix/sshpty.c Unix/strlcpy.h Unix/strlcpy.c \
 	       Unix/sys_unix.cpp Unix/timer_unix.cpp Unix/xpram_unix.cpp \
 	       Unix/sigsegv.h Unix/sigsegv.cpp Unix/vm_alloc.h Unix/vm_alloc.cpp \
-	       Unix/posix_sem.cpp Unix/video_vosf.h Unix/video_blit.h \
-	       Unix/video_blit.cpp Unix/config.sub Unix/config.guess \
-	       Unix/keycodes Unix/tunconfig \
-	       Unix/Linux/scsi_linux.cpp Unix/Linux/NetDriver \
+	       Unix/semaphore.h Unix/posix_sem.cpp Unix/video_vosf.h Unix/video_blit.h \
+	       Unix/video_blit.cpp Unix/config.sub Unix/config.guess Unix/m4 \
+	       Unix/keycodes Unix/tunconfig Unix/clip_unix.cpp Unix/Irix/audio_irix.cpp \
+	       Unix/Linux/scsi_linux.cpp Unix/Linux/NetDriver Unix/ether_unix.cpp \
+	       Unix/rpc.h Unix/rpc_unix.cpp Unix/ldscripts Unix/Darwin/mkstandalone \
 	       Unix/Darwin/lowmem.c Unix/Darwin/pagezero.c Unix/Darwin/testlmem.sh \
-	       dummy/audio_dummy.cpp dummy/clip_dummy.cpp \
-	       dummy/prefs_editor_dummy.cpp dummy/scsi_dummy.cpp SDL \
+	       dummy/audio_dummy.cpp dummy/clip_dummy.cpp dummy/serial_dummy.cpp \
+	       dummy/prefs_editor_dummy.cpp dummy/scsi_dummy.cpp SDL slirp \
 	       MacOSX/sys_darwin.cpp MacOSX/clip_macosx.cpp \
-	       MacOSX/macos_util_macosx.h MacOSX/extfs_macosx.h \
-	       MacOSX/extfs_macosx.mm'; \
-	PREFIX="`pwd`/"; case $(B2_TOPDIR) in /*) PREFIX="";; esac; \
+	       MacOSX/macos_util_macosx.h Unix/cpr.sh \
+	       MacOSX/extfs_macosx.cpp Windows/clip_windows.cpp \
+	       MacOSX/MacOSX_sound_if.cpp MacOSX/MacOSX_sound_if.h \
+	       MacOSX/AudioBackEnd.cpp MacOSX/AudioBackEnd.h \
+	       MacOSX/AudioDevice.cpp MacOSX/AudioDevice.h MacOSX/audio_macosx.cpp \
+	       Windows/cd_defs.h Windows/cdenable Windows/extfs_windows.cpp \
+	       Windows/posix_emu.cpp Windows/posix_emu.h Windows/sys_windows.cpp \
+	       Windows/timer_windows.cpp Windows/util_windows.cpp \
+	       Windows/util_windows.h Windows/xpram_windows.cpp \
+	       Windows/kernel_windows.h Windows/kernel_windows.cpp \
+	       Windows/serial_windows.cpp Windows/router Windows/b2ether \
+	       Windows/ether_windows.h Windows/ether_windows.cpp \
+	       Windows/serial_windows.cpp Windows/prefs_editor_gtk.cpp \
+	       uae_cpu/compiler/codegen_x86.h'; \
+	PREFIX="../"; case $(B2_TOPDIR) in /*) PREFIX="";; esac; \
 	for i in $$list; do \
-	  echo $$i; \
-	  ln -sf $${PREFIX}$(B2_TOPDIR)/src/$$i src/$$i; \
-	done;
+	  if test "$$i" != "\\"; then \
+	    echo $$i; o=$$i; \
+	    case $$i in *codegen_x86.h) o=kpx_cpu/src/cpu/jit/x86/codegen_x86.h;; esac; \
+	    SUB=`echo $$o | sed 's;[^/]*/;../;g' | sed 's;[^/]*$$;;'` ;\
+	    ln -sf "$$PREFIX$$SUB$(B2_TOPDIR)/src/$$i" src/$$o; \
+	  fi; \
+	done; \
+	ln -sf ../../../../../SheepShaver/src/Unix/config.h $(B2_TOPDIR)/src/Unix/Linux/NetDriver/config.h