--- SheepShaver/src/Unix/Makefile.in	2003/05/13 16:59:57	1.3
+++ SheepShaver/src/Unix/Makefile.in	2004/01/18 22:12:24	1.9
@@ -20,6 +20,10 @@ DEFS = @DEFS@ -D_REENTRANT -DDATADIR=\"$
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 SYSSRCS = @SYSSRCS@
+CPUSRCS = @CPUSRCS@
+DYNGENSRCS = @DYNGENSRCS@
+DYNGEN_OP_FLAGS = @DYNGEN_OP_FLAGS@
+BLESS = @BLESS@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
 INSTALL_DATA = @INSTALL_DATA@
@@ -29,11 +33,11 @@ SRCS = main_unix.cpp ../prefs.cpp ../pre
     ../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 \
+    ../video.cpp video_blit.cpp video_x.cpp ../audio.cpp ../ether.cpp ../thunks.cpp \
+    ../serial.cpp ../extfs.cpp extfs_unix.cpp \
     about_window_unix.cpp ../user_strings.cpp user_strings_unix.cpp \
     vm_alloc.cpp sigsegv.cpp \
-    sshpty.c strlcpy.c $(SYSSRCS)
+    sshpty.c strlcpy.c $(SYSSRCS) $(CPUSRCS)
 APP = SheepShaver
 
 ## Rules
@@ -53,12 +57,19 @@ 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)
+	$(BLESS) $(APP)
 
 modules:
 	cd NetDriver; make
@@ -75,7 +86,8 @@ uninstall:
 	rm -f $(man1dir)/$(APP).1
 
 clean:
-	rm -f $(APP) $(OBJ_DIR)/* core* *.core *~ *.bak
+	rm -f $(APP) $(OBJ_DIR)/* core* *.core *~ *.bak ppc-execute-impl.cpp
+	rm -f dyngen basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
 
 distclean: clean
 	rm -rf $(OBJ_DIR)
@@ -94,5 +106,27 @@ $(OBJ_DIR)/%.o : %.S
 	$(AS) $(ASFLAGS) -o $@ $*.s
 	rm $*.s
 
+# Kheperix CPU emulator
+GENEXEC = ../kpx_cpu/src/cpu/ppc/genexec.pl
+
+$(OBJ_DIR)/ppc-execute.o: ppc-execute-impl.cpp
+ppc-execute-impl.cpp: ../kpx_cpu/src/cpu/ppc/ppc-decode.cpp $(GENEXEC)
+	$(CPP) $(CPPFLAGS) -DGENEXEC $< | $(GENEXEC) > $@
+
+dyngen: $(DYNGENOBJS)
+	$(CXX) -o $@ $(LDFLAGS) $(DYNGENOBJS)
+
+$(OBJ_DIR)/basic-dyngen.o: basic-dyngen-ops.hpp
+$(OBJ_DIR)/basic-dyngen-ops.o: ../kpx_cpu/src/cpu/jit/basic-dyngen-ops.cpp
+	$(CXX) $(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: ../kpx_cpu/src/cpu/ppc/ppc-dyngen-ops.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) $(DYNGEN_OP_FLAGS) -c $< -o $@
+ppc-dyngen-ops.hpp: $(OBJ_DIR)/ppc-dyngen-ops.o dyngen
+	./dyngen -o $@ $<
+
 #-------------------------------------------------------------------------
 # DO NOT DELETE THIS LINE -- make depend depends on it.