--- SheepShaver/Makefile	2003/09/14 22:10:57	1.7
+++ SheepShaver/Makefile	2005/11/30 00:29:29	1.24
@@ -1,22 +1,19 @@
 # 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)
 
 SRCARCHIVE := $(shell date +SheepShaver_src_%d%m%Y.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
 B2_TOPDIR := ../BasiliskII
 
-# Where Kheperix directory can be found
-KPX_TOPDIR := ../kheperix
-
 default: help
 
 help:
@@ -24,7 +21,6 @@ help:
 	@echo "The following targets are available:"
 	@echo "  tarball  source tarball ($(SRCARCHIVE))"
 	@echo "  links    create links to Basilisk II sources"
-	@echo "  kpx_cpu  synchronize with Kheperix CPU emulator"
 
 clean:
 	-rm -f $(SRCARCHIVE)
@@ -37,9 +33,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)
@@ -62,41 +62,26 @@ links:
 	       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/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/keycodes Unix/tunconfig Unix/clip_unix.cpp Unix/m4 \
+	       Unix/Linux/scsi_linux.cpp Unix/Linux/NetDriver Unix/ether_unix.cpp \
+	       Unix/Darwin/lowmem.c Unix/Darwin/pagezero.c Unix/Darwin/testlmem.sh \
+	       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 Windows/clip_windows.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'; \
 	PREFIX="`pwd`/"; case $(B2_TOPDIR) in /*) PREFIX="";; esac; \
 	for i in $$list; do \
 	  echo $$i; \
-	  ln -sf $${PREFIX}$(B2_TOPDIR)/src/$$i src/$$i; \
-	done;
-
-#
-# Synchronize with Kheperix CPU emulator"
-#
-kpx_cpu:
-	@list='include/basic-blockinfo.hpp \
-	       include/basic-cpu.hpp \
-	       include/basic-plugin.hpp \
-	       include/task-plugin.hpp \
-	       include/block-alloc.hpp \
-	       src/cpu/block-cache.hpp \
-	       src/cpu/vm.hpp \
-	       src/cpu/ppc/ppc-cpu.hpp \
-	       src/cpu/ppc/ppc-cpu.cpp \
-	       src/cpu/ppc/ppc-decode.cpp \
-	       src/cpu/ppc/ppc-execute.cpp \
-	       src/cpu/ppc/genexec.pl \
-	       src/cpu/ppc/ppc-bitfields.hpp \
-	       src/cpu/ppc/ppc-blockinfo.hpp \
-	       src/cpu/ppc/ppc-config.hpp \
-	       src/cpu/ppc/ppc-operands.hpp \
-	       src/cpu/ppc/ppc-operations.hpp \
-	       src/cpu/ppc/ppc-registers.hpp \
-	       src/test/test-powerpc.cpp'; \
-	for i in $$list; do \
-	  echo $$i; \
-	  mkdir -p src/kpx_cpu/`dirname $$i`; \
-	  cp -f  $(KPX_TOPDIR)/$$i src/kpx_cpu/$$i; \
-	  /bin/true ln -sf $$i src/kpx_cpu/`basename $$i`; \
+	  ln -sf "$${PREFIX}$(B2_TOPDIR)/src/$$i" src/$$i; \
 	done;