--- SheepShaver/src/Unix/Makefile.in	2004/12/18 22:36:16	1.24
+++ SheepShaver/src/Unix/Makefile.in	2005/06/30 22:19:01	1.34
@@ -24,6 +24,8 @@ LIBS = @LIBS@
 SYSSRCS = @SYSSRCS@
 CPUSRCS = @CPUSRCS@
 MONSRCS = @MONSRCS@
+PERL = @PERL@
+USE_DYNGEN = @USE_DYNGEN@
 DYNGENSRCS = @DYNGENSRCS@
 DYNGEN_CC = @DYNGEN_CC@
 DYNGEN_OP_FLAGS = @DYNGEN_OP_FLAGS@
@@ -34,8 +36,13 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
 INSTALL_DATA = @INSTALL_DATA@
 
+# Append disassembler to dyngen, if available
+ifneq (:no,$(MONSRCS):$(USE_DYNGEN))
+DYNGENSRCS += $(filter %i386-dis.c,$(MONSRCS))
+endif
+
 ## Files
-SRCS = main_unix.cpp ../prefs.cpp ../prefs_items.cpp prefs_unix.cpp sys_unix.cpp \
+SRCS = ../main.cpp 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 ../sony.cpp ../disk.cpp ../cdrom.cpp ../scsi.cpp \
@@ -90,7 +97,7 @@ $(APP)_app: $(APP) ../MacOSX/Info.plist
 	cp -f ../MacOSX/SheepShaver.icns $(APP_APP)/Contents/Resources/
 
 modules:
-	cd NetDriver; make
+	cd Linux/NetDriver; make
 
 install: $(APP_EXE) installdirs
 	$(INSTALL_PROGRAM) $(APP_EXE) $(DESTDIR)$(bindir)/$(APP_EXE)
@@ -111,7 +118,7 @@ uninstall:
 
 clean:
 	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 -f dyngen basic-dyngen-ops.hpp ppc-dyngen-ops.hpp ppc_asm.out.s
 	rm -rf $(APP_APP)
 
 distclean: clean
@@ -130,16 +137,16 @@ $(OBJ_DIR)/%.o : %.cpp
 $(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
+	$(CPP) $(CPPFLAGS) -D__ASSEMBLY__ $< -o $*.out.s
+	$(AS) $(ASFLAGS) -o $@ $*.out.s
+	rm $*.out.s
 
 # Kheperix CPU emulator
 kpxsrcdir = ../kpx_cpu/src
-GENEXEC   = $(kpxsrcdir)/cpu/ppc/genexec.pl
+GENEXECPL = $(kpxsrcdir)/cpu/ppc/genexec.pl
 DYNGEN    = dyngen$(EXEEXT)
 
-ifneq ($(DYNGENSRCS),)
+ifeq ($(USE_DYNGEN),yes)
 DYNGENDEPS = basic-dyngen-ops.hpp ppc-dyngen-ops.hpp
 
 $(DYNGEN): $(DYNGENOBJS)
@@ -161,13 +168,13 @@ $(OBJ_DIR)/sheepshaver_glue.o $(OBJ_DIR)
 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) > $@
+ppc-execute-impl.cpp: $(kpxsrcdir)/cpu/ppc/ppc-decode.cpp $(GENEXECPL) $(DYNGENDEPS)
+	$(CPP) $(CPPFLAGS) -DGENEXEC $< | $(PERL) $(GENEXECPL) > $@
 
 # 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_)
+ifeq ($(USE_DYNGEN),yes)
+TESTSRCS_ += cpu/jit/jit-cache.cpp cpu/jit/basic-dyngen.cpp cpu/ppc/ppc-dyngen.cpp
 endif
 TESTSRCS  = $(TESTSRCS_:%.cpp=$(kpxsrcdir)/%.cpp)