--- SheepShaver/src/Unix/Makefile.in	2002/02/04 16:58:13	1.1
+++ SheepShaver/src/Unix/Makefile.in	2004/12/18 22:36:16	1.24
@@ -11,6 +11,8 @@ datadir = @datadir@
 mandir = @mandir@
 man1dir = $(mandir)/man1
 
+DESTDIR =
+
 CC = @CC@
 CXX = @CXX@
 CFLAGS = @CFLAGS@
@@ -20,6 +22,14 @@ DEFS = @DEFS@ -D_REENTRANT -DDATADIR=\"$
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 SYSSRCS = @SYSSRCS@
+CPUSRCS = @CPUSRCS@
+MONSRCS = @MONSRCS@
+DYNGENSRCS = @DYNGENSRCS@
+DYNGEN_CC = @DYNGEN_CC@
+DYNGEN_OP_FLAGS = @DYNGEN_OP_FLAGS@
+BLESS = @BLESS@
+EXEEXT = @EXEEXT@
+KEYCODES = @KEYCODES@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
 INSTALL_DATA = @INSTALL_DATA@
@@ -28,18 +38,22 @@ INSTALL_DATA = @INSTALL_DATA@
 SRCS = main_unix.cpp ../prefs.cpp ../prefs_items.cpp prefs_unix.cpp sys_unix.cpp \
     ../rom_patches.cpp ../rsrc_patches.cpp ../emul_op.cpp ../name_registry.cpp \
     ../macos_util.cpp ../timer.cpp timer_unix.cpp ../xpram.cpp xpram_unix.cpp \
-    ../adb.cpp clip_unix.cpp ../sony.cpp ../disk.cpp ../cdrom.cpp ../scsi.cpp \
-    Linux/scsi_linux.cpp ../video.cpp video_x.cpp ../audio.cpp audio_oss_esd.cpp ../ether.cpp \
-    Linux/ether_linux.cpp ../serial.cpp serial_unix.cpp ../extfs.cpp extfs_unix.cpp \
-    about_window_unix.cpp ../user_strings.cpp user_strings_unix.cpp $(SYSSRCS)
+    ../adb.cpp ../sony.cpp ../disk.cpp ../cdrom.cpp ../scsi.cpp \
+    ../gfxaccel.cpp ../video.cpp video_blit.cpp ../audio.cpp ../ether.cpp ../thunks.cpp \
+    ../serial.cpp ../extfs.cpp \
+    about_window_unix.cpp ../user_strings.cpp user_strings_unix.cpp \
+    vm_alloc.cpp sigsegv.cpp \
+    sshpty.c strlcpy.c $(SYSSRCS) $(CPUSRCS) $(MONSRCS)
 APP = SheepShaver
+APP_EXE = $(APP)$(EXEEXT)
+APP_APP = $(APP).app
 
 ## Rules
 .PHONY: modules install uninstall clean distclean depend dep
 .SUFFIXES:
 .SUFFIXES: .c .cpp .S .o .h
 
-all: $(APP)
+all: $(APP_EXE)
 
 OBJ_DIR = obj
 $(OBJ_DIR)::
@@ -51,34 +65,60 @@ define SRCS_LIST_TO_OBJS
 endef
 OBJS = $(SRCS_LIST_TO_OBJS)
 
+define DYNGENSRCS_LIST_TO_OBJS
+	$(addprefix $(OBJ_DIR)/, $(addsuffix .o, $(foreach file, $(DYNGENSRCS), \
+	$(basename $(notdir $(file))))))
+endef
+DYNGENOBJS = $(DYNGENSRCS_LIST_TO_OBJS)
+
 SRC_PATHS += $(sort $(foreach file, $(SRCS), $(dir $(file))))
 VPATH :=
 VPATH += $(addprefix :, $(subst  ,:, $(filter-out $($(subst, :, ,$(VPATH))), $(SRC_PATHS))))
 
-$(APP): $(OBJ_DIR) $(OBJS)
-	$(CXX) -o $(APP) $(LDFLAGS) $(OBJS) $(LIBS)
+$(APP_EXE): $(OBJ_DIR) $(OBJS)
+	$(CXX) -o $(APP_EXE) $(LDFLAGS) $(OBJS) $(LIBS)
+	$(BLESS) $(APP_EXE)
+
+$(APP)_app: $(APP) ../MacOSX/Info.plist ../MacOSX/SheepShaver.icns
+	mkdir -p $(APP_APP)/Contents
+	cp -f ../MacOSX/Info.plist $(APP_APP)/Contents/
+	echo -n 'APPL????' > $(APP_APP)/Contents/PkgInfo
+	mkdir -p $(APP_APP)/Contents/MacOS
+	cp -f $(APP) $(APP_APP)/Contents/MacOS/
+	strip $(APP_APP)/Contents/MacOS/$(APP)
+	mkdir -p $(APP_APP)/Contents/Resources
+	cp -f ../MacOSX/SheepShaver.icns $(APP_APP)/Contents/Resources/
 
 modules:
 	cd NetDriver; make
 
-install: $(APP) installdirs
-	$(INSTALL_PROGRAM) $(APP) $(bindir)/$(APP)
-	-$(INSTALL_DATA) $(APP).1 $(man1dir)/$(APP).1
+install: $(APP_EXE) installdirs
+	$(INSTALL_PROGRAM) $(APP_EXE) $(DESTDIR)$(bindir)/$(APP_EXE)
+	-$(INSTALL_DATA) $(APP).1 $(DESTDIR)$(man1dir)/$(APP).1
+	$(INSTALL_DATA) $(KEYCODES) $(DESTDIR)$(datadir)/$(APP)/keycodes
+	$(INSTALL_DATA) tunconfig $(DESTDIR)$(datadir)/$(APP)/tunconfig
+	chmod 755 $(DESTDIR)$(datadir)/$(APP)/tunconfig
 
 installdirs:
-	$(SHELL) mkinstalldirs $(bindir) $(man1dir)
+	$(SHELL) mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(datadir)/$(APP)
 
 uninstall:
-	rm -f $(bindir)/$(APP)
-	rm -f $(man1dir)/$(APP).1
+	rm -f $(DESTDIR)$(bindir)/$(APP_EXE)
+	rm -f $(DESTDIR)$(man1dir)/$(APP).1
+	rm -f $(DESTDIR)$(datadir)/$(APP)/keycodes
+	rm -f $(DESTDIR)$(datadir)/$(APP)/tunconfig
+	rmdir $(DESTDIR)$(datadir)/$(APP)
 
 clean:
-	rm -f $(APP) $(OBJ_DIR)/* core* *.core *~ *.bak
+	rm -f $(APP_EXE) $(OBJ_DIR)/* core* *.core *~ *.bak ppc-execute-impl.cpp
+	rm -f dyngen basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
+	rm -rf $(APP_APP)
 
 distclean: clean
 	rm -rf $(OBJ_DIR)
 	rm -f Makefile
 	rm -f config.cache config.log config.status config.h
+	rm -f ../MacOSX/Info.plist
 
 depend dep:
 	makedepend $(CPPFLAGS) -Y. $(SRCS) 2>/dev/null
@@ -87,10 +127,61 @@ $(OBJ_DIR)/%.o : %.c
 	$(CC) $(CPPFLAGS) $(DEFS) $(CFLAGS) -c $< -o $@
 $(OBJ_DIR)/%.o : %.cpp
 	$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
+$(OBJ_DIR)/%.o : %.mm
+	$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
 $(OBJ_DIR)/%.o : %.S
 	$(CPP) $(CPPFLAGS) -D__ASSEMBLY__ $< -o $*.s
 	$(AS) $(ASFLAGS) -o $@ $*.s
 	rm $*.s
 
+# Kheperix CPU emulator
+kpxsrcdir = ../kpx_cpu/src
+GENEXEC   = $(kpxsrcdir)/cpu/ppc/genexec.pl
+DYNGEN    = dyngen$(EXEEXT)
+
+ifneq ($(DYNGENSRCS),)
+DYNGENDEPS = basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
+
+$(DYNGEN): $(DYNGENOBJS)
+	$(CXX) -o $@ $(LDFLAGS) $(DYNGENOBJS)
+
+$(OBJ_DIR)/basic-dyngen.o: basic-dyngen-ops.hpp
+$(OBJ_DIR)/basic-dyngen-ops.o: $(kpxsrcdir)/cpu/jit/basic-dyngen-ops.cpp
+	$(DYNGEN_CC) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(DYNGEN_OP_FLAGS) -c $< -o $@
+basic-dyngen-ops.hpp: $(OBJ_DIR)/basic-dyngen-ops.o $(DYNGEN)
+	./$(DYNGEN) -o $@ $<
+
+$(OBJ_DIR)/ppc-dyngen.o: ppc-dyngen-ops.hpp
+$(OBJ_DIR)/ppc-dyngen-ops.o: $(kpxsrcdir)/cpu/ppc/ppc-dyngen-ops.cpp basic-dyngen-ops.hpp
+	$(DYNGEN_CC) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(DYNGEN_OP_FLAGS) -c $< -o $@
+ppc-dyngen-ops.hpp: $(OBJ_DIR)/ppc-dyngen-ops.o $(DYNGEN)
+	./$(DYNGEN) -o $@ $<
+
+$(OBJ_DIR)/sheepshaver_glue.o $(OBJ_DIR)/ppc-cpu.o $(OBJ_DIR)/ppc-decode.o $(OBJ_DIR)/ppc-translate.o: basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
+endif
+
+$(OBJ_DIR)/ppc-execute.o: ppc-execute-impl.cpp
+ppc-execute-impl.cpp: $(kpxsrcdir)/cpu/ppc/ppc-decode.cpp $(GENEXEC) $(DYNGENDEPS)
+	$(CPP) $(CPPFLAGS) -DGENEXEC $< | $(GENEXEC) > $@
+
+# PowerPC CPU tester
+TESTSRCS_ = mathlib/ieeefp.cpp cpu/ppc/ppc-cpu.cpp cpu/ppc/ppc-decode.cpp cpu/ppc/ppc-execute.cpp cpu/ppc/ppc-translate.cpp test/test-powerpc.cpp $(MONSRCS) vm_alloc.cpp
+ifneq ($(DYNGENSRCS),)
+TESTSRCS_ = cpu/jit/jit-cache.cpp cpu/jit/basic-dyngen.cpp cpu/ppc/ppc-dyngen.cpp $(TESTSRCS_)
+endif
+TESTSRCS  = $(TESTSRCS_:%.cpp=$(kpxsrcdir)/%.cpp)
+
+define TESTSRCS_LIST_TO_OBJS
+	$(addprefix $(OBJ_DIR)/, $(addsuffix .o, $(foreach file, $(TESTSRCS), \
+	$(basename $(notdir $(file))))))
+endef
+TESTOBJS  = $(TESTSRCS_LIST_TO_OBJS)
+
+$(OBJ_DIR)/test-powerpc.o: $(kpxsrcdir)/test/test-powerpc.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -DEMU_KHEPERIX -c $< -o $@
+
+test-powerpc$(EXEEXT): $(TESTOBJS)
+	$(CXX) -o $@ $(LDFLAGS) $(TESTOBJS) $(LIBS)
+
 #-------------------------------------------------------------------------
 # DO NOT DELETE THIS LINE -- make depend depends on it.