--- BasiliskII/src/Unix/Makefile.in	2000/07/25 15:19:42	1.17
+++ BasiliskII/src/Unix/Makefile.in	2004/06/27 18:14:43	1.31
@@ -11,6 +11,10 @@ datadir = @datadir@
 mandir = @mandir@
 man1dir = $(mandir)/man1
 
+KEYCODES = @KEYCODES@
+
+DESTDIR =
+
 CC = @CC@
 CXX = @CXX@
 CFLAGS = @CFLAGS@
@@ -21,6 +25,7 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 SYSSRCS = @SYSSRCS@
 CPUSRCS = @CPUSRCS@
+BLESS = @BLESS@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
 INSTALL_DATA = @INSTALL_DATA@
@@ -29,15 +34,15 @@ INSTALL_DATA = @INSTALL_DATA@
 SRCS = ../main.cpp main_unix.cpp ../prefs.cpp ../prefs_items.cpp prefs_unix.cpp \
     sys_unix.cpp ../rom_patches.cpp ../slot_rom.cpp ../rsrc_patches.cpp \
     ../emul_op.cpp ../macos_util.cpp ../xpram.cpp xpram_unix.cpp ../timer.cpp \
-    timer_unix.cpp clip_unix.cpp ../adb.cpp ../serial.cpp ../ether.cpp \
-    ../sony.cpp ../disk.cpp ../cdrom.cpp ../scsi.cpp ../video.cpp video_x.cpp \
-    ../audio.cpp ../extfs.cpp extfs_unix.cpp ../user_strings.cpp \
-    user_strings_unix.cpp \
+    timer_unix.cpp ../adb.cpp ../serial.cpp ../ether.cpp \
+    ../sony.cpp ../disk.cpp ../cdrom.cpp ../scsi.cpp ../video.cpp video_blit.cpp \
+    vm_alloc.cpp sigsegv.cpp ../audio.cpp ../extfs.cpp extfs_unix.cpp \
+	../user_strings.cpp user_strings_unix.cpp sshpty.c strlcpy.c \
     $(SYSSRCS) $(CPUSRCS)
 APP = BasiliskII
 
 ## Rules
-.PHONY: modules install uninstall clean distclean depend dep
+.PHONY: modules install installdirs uninstall mostlyclean clean distclean depend dep
 .SUFFIXES:
 .SUFFIXES: .c .cpp .s .o .h
 
@@ -59,36 +64,41 @@ VPATH += $(addprefix :, $(subst  ,:, $(f
 
 $(APP): $(OBJ_DIR) $(OBJS)
 	$(CXX) -o $(APP) $(LDFLAGS) $(OBJS) $(LIBS)
+	$(BLESS) $(APP)
 
 modules:
 	cd Linux/NetDriver; make
 
 install: $(APP) installdirs
-	$(INSTALL_PROGRAM) $(APP) $(bindir)/$(APP)
-	-$(INSTALL_DATA) $(APP).1 $(man1dir)/$(APP).1
-	$(INSTALL_DATA) keycodes $(datadir)/$(APP)/keycodes
-	$(INSTALL_DATA) fbdevices $(datadir)/$(APP)/fbdevices
+	$(INSTALL_PROGRAM) $(APP) $(DESTDIR)$(bindir)/$(APP)
+	-$(INSTALL_DATA) $(APP).1 $(DESTDIR)$(man1dir)/$(APP).1
+	$(INSTALL_DATA) $(KEYCODES) $(DESTDIR)$(datadir)/$(APP)/keycodes
+	$(INSTALL_DATA) fbdevices $(DESTDIR)$(datadir)/$(APP)/fbdevices
+	$(INSTALL_DATA) tunconfig $(DESTDIR)$(datadir)/$(APP)/tunconfig
 
 installdirs:
-	$(SHELL) mkinstalldirs $(bindir) $(man1dir) $(datadir)/$(APP)
+	$(SHELL) mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) $(DESTDIR)$(datadir)/$(APP)
 
 uninstall:
-	rm -f $(bindir)/$(APP)
-	rm -f $(man1dir)/$(APP).1
-	rm -f $(datadir)/$(APP)/keycodes
-	rm -f $(datadir)/$(APP)/fbdevices
-	rmdir $(datadir)/$(APP)
+	rm -f $(DESTDIR)$(bindir)/$(APP)
+	rm -f $(DESTDIR)$(man1dir)/$(APP).1
+	rm -f $(DESTDIR)$(datadir)/$(APP)/keycodes
+	rm -f $(DESTDIR)$(datadir)/$(APP)/fbdevices
+	rm -f $(DESTDIR)$(datadir)/$(APP)/tunconfig
+	rmdir $(DESTDIR)$(datadir)/$(APP)
 
 mostlyclean:
 	rm -f $(APP) $(OBJ_DIR)/* core* *.core *~ *.bak
 
 clean: mostlyclean
-	rm -f cpuemu.cpp cpudefs.cpp cputmp*.s cpufast*.s cpustbl.cpp cputbl.h
+	rm -f cpuemu.cpp cpudefs.cpp cputmp*.s cpufast*.s cpustbl.cpp cputbl.h compemu.cpp compstbl.cpp comptbl.h
 
 distclean: clean
 	rm -rf $(OBJ_DIR)
+	rm -rf autom4te.cache
 	rm -f Makefile
-	rm -f config.cache config.log config.status config.h
+	rm -f config.cache config.log config.status config.h config.h.in
+	rm -f Darwin/lowmem Darwin/pagezero
 
 depend dep:
 	makedepend $(CPPFLAGS) -Y. $(SRCS) 2>/dev/null
@@ -105,15 +115,30 @@ $(OBJ_DIR)/cpuopti: $(OBJ_DIR)/cpuopti.o
 $(OBJ_DIR)/build68k: $(OBJ_DIR)/build68k.o
 	$(CC) $(LDFLAGS) -o $(OBJ_DIR)/build68k $(OBJ_DIR)/build68k.o
 $(OBJ_DIR)/gencpu: $(OBJ_DIR)/gencpu.o $(OBJ_DIR)/readcpu.o $(OBJ_DIR)/cpudefs.o
-	$(CC) $(LDFLAGS) -o $(OBJ_DIR)/gencpu $(OBJ_DIR)/gencpu.o $(OBJ_DIR)/readcpu.o $(OBJ_DIR)/cpudefs.o
+	$(CXX) $(LDFLAGS) -o $(OBJ_DIR)/gencpu $(OBJ_DIR)/gencpu.o $(OBJ_DIR)/readcpu.o $(OBJ_DIR)/cpudefs.o
+$(OBJ_DIR)/gencomp: $(OBJ_DIR)/gencomp.o $(OBJ_DIR)/readcpu.o $(OBJ_DIR)/cpudefs.o
+	$(CXX) $(LDFLAGS) -o $(OBJ_DIR)/gencomp $(OBJ_DIR)/gencomp.o $(OBJ_DIR)/readcpu.o $(OBJ_DIR)/cpudefs.o
+
 cpudefs.cpp: $(OBJ_DIR)/build68k ../uae_cpu/table68k
 	$(OBJ_DIR)/build68k <../uae_cpu/table68k >cpudefs.cpp
 cpustbl.cpp: cpuemu.cpp
+cpustbl_nf.cpp: cpustbl.cpp
+compstbl.cpp: compemu.cpp
 cputbl.h: cpuemu.cpp
+comptbl.h: compemu.cpp
 
 cpuemu.cpp: $(OBJ_DIR)/gencpu
 	$(OBJ_DIR)/gencpu
 
+compemu.cpp: $(OBJ_DIR)/gencomp
+	$(OBJ_DIR)/gencomp
+
+$(OBJ_DIR)/cpustbl_nf.o: cpustbl.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -DNOFLAGS -c $< -o $@
+
+$(OBJ_DIR)/compemu_support.o: compemu_support.cpp comptbl.h
+	$(CXX) $(CPPFLAGS) $(DEFS) $(CXXFLAGS) -c $< -o $@
+
 $(OBJ_DIR)/cpuemu1.o: cpuemu.cpp
 	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_1 $(CXXFLAGS) -c $< -o $@
 $(OBJ_DIR)/cpuemu2.o: cpuemu.cpp
@@ -131,6 +156,40 @@ $(OBJ_DIR)/cpuemu7.o: cpuemu.cpp
 $(OBJ_DIR)/cpuemu8.o: cpuemu.cpp
 	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_8 $(CXXFLAGS) -c $< -o $@
 
+$(OBJ_DIR)/cpuemu1_nf.o: cpuemu.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_1 -DNOFLAGS $(CXXFLAGS) -c $< -o $@
+$(OBJ_DIR)/cpuemu2_nf.o: cpuemu.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_2 -DNOFLAGS $(CXXFLAGS) -c $< -o $@
+$(OBJ_DIR)/cpuemu3_nf.o: cpuemu.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_3 -DNOFLAGS $(CXXFLAGS) -c $< -o $@
+$(OBJ_DIR)/cpuemu4_nf.o: cpuemu.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_4 -DNOFLAGS $(CXXFLAGS) -c $< -o $@
+$(OBJ_DIR)/cpuemu5_nf.o: cpuemu.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_5 -DNOFLAGS $(CXXFLAGS) -c $< -o $@
+$(OBJ_DIR)/cpuemu6_nf.o: cpuemu.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_6 -DNOFLAGS $(CXXFLAGS) -c $< -o $@
+$(OBJ_DIR)/cpuemu7_nf.o: cpuemu.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_7 -DNOFLAGS $(CXXFLAGS) -c $< -o $@
+$(OBJ_DIR)/cpuemu8_nf.o: cpuemu.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_8 -DNOFLAGS $(CXXFLAGS) -c $< -o $@
+
+$(OBJ_DIR)/compemu1.o: compemu.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_1 $(CXXFLAGS) -c $< -o $@
+$(OBJ_DIR)/compemu2.o: compemu.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_2 $(CXXFLAGS) -c $< -o $@
+$(OBJ_DIR)/compemu3.o: compemu.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_3 $(CXXFLAGS) -c $< -o $@
+$(OBJ_DIR)/compemu4.o: compemu.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_4 $(CXXFLAGS) -c $< -o $@
+$(OBJ_DIR)/compemu5.o: compemu.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_5 $(CXXFLAGS) -c $< -o $@
+$(OBJ_DIR)/compemu6.o: compemu.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_6 $(CXXFLAGS) -c $< -o $@
+$(OBJ_DIR)/compemu7.o: compemu.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_7 $(CXXFLAGS) -c $< -o $@
+$(OBJ_DIR)/compemu8.o: compemu.cpp
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_8 $(CXXFLAGS) -c $< -o $@
+
 cpufast.s: cpuemu.cpp $(OBJ_DIR)/cpuopti
 	$(CXX) $(CPPFLAGS) $(DEFS) -S $(CXXFLAGS) $< -o cputmp.s
 	$(OBJ_DIR)/cpuopti <cputmp.s >$@ || mv cputmp.s $@
@@ -168,5 +227,42 @@ cpufast8.s: cpuemu.cpp $(OBJ_DIR)/cpuopt
 	$(OBJ_DIR)/cpuopti <cputmp8.s >$@ || mv cputmp8.s $@
 	rm -f cputmp8.s
 
+cpufast_nf.s: cpuemu.cpp $(OBJ_DIR)/cpuopti
+	$(CXX) $(CPPFLAGS) $(DEFS) -DNOFLAGS -S $(CXXFLAGS) $< -o cputmp_nf.s
+	$(OBJ_DIR)/cpuopti <cputmp_nf.s >$@ || mv cputmp_nf.s $@
+	rm -f cputmp_nf.s
+cpufast1_nf.s: cpuemu.cpp $(OBJ_DIR)/cpuopti
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_1 -DNOFLAGS -S $(CXXFLAGS) $< -o cputmp1_nf.s
+	$(OBJ_DIR)/cpuopti <cputmp1_nf.s >$@ || mv cputmp1_nf.s $@
+	rm -f cputmp1_nf.s
+cpufast2_nf.s: cpuemu.cpp $(OBJ_DIR)/cpuopti
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_2 -DNOFLAGS -S $(CXXFLAGS) $< -o cputmp2_nf.s
+	$(OBJ_DIR)/cpuopti <cputmp2_nf.s >$@ || mv cputmp2_nf.s $@
+	rm -f cputmp2_nf.s
+cpufast3_nf.s: cpuemu.cpp $(OBJ_DIR)/cpuopti
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_3 -DNOFLAGS -S $(CXXFLAGS) $< -o cputmp3_nf.s
+	$(OBJ_DIR)/cpuopti <cputmp3_nf.s >$@ || mv cputmp3_nf.s $@
+	rm -f cputmp3_nf.s
+cpufast4_nf.s: cpuemu.cpp $(OBJ_DIR)/cpuopti
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_4 -DNOFLAGS -S $(CXXFLAGS) $< -o cputmp4_nf.s
+	$(OBJ_DIR)/cpuopti <cputmp4_nf.s >$@ || mv cputmp4_nf.s $@
+	rm -f cputmp4_nf.s
+cpufast5_nf.s: cpuemu.cpp $(OBJ_DIR)/cpuopti
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_5 -DNOFLAGS -S $(CXXFLAGS) $< -o cputmp5_nf.s
+	$(OBJ_DIR)/cpuopti <cputmp5_nf.s >$@ || mv cputmp5_nf.s $@
+	rm -f cputmp5_nf.s
+cpufast6_nf.s: cpuemu.cpp $(OBJ_DIR)/cpuopti
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_6 -DNOFLAGS -S $(CXXFLAGS) $< -o cputmp6_nf.s
+	$(OBJ_DIR)/cpuopti <cputmp6_nf.s >$@ || mv cputmp6_nf.s $@
+	rm -f cputmp6_nf.s
+cpufast7_nf.s: cpuemu.cpp $(OBJ_DIR)/cpuopti
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_7 -DNOFLAGS -S $(CXXFLAGS) $< -o cputmp7_nf.s
+	$(OBJ_DIR)/cpuopti <cputmp7_nf.s >$@ || mv cputmp7_nf.s $@
+	rm -f cputmp7_nf.s
+cpufast8_nf.s: cpuemu.cpp $(OBJ_DIR)/cpuopti
+	$(CXX) $(CPPFLAGS) $(DEFS) -DPART_8 -DNOFLAGS -S $(CXXFLAGS) $< -o cputmp8_nf.s
+	$(OBJ_DIR)/cpuopti <cputmp8_nf.s >$@ || mv cputmp8_nf.s $@
+	rm -f cputmp8_nf.s
+
 #-------------------------------------------------------------------------
 # DO NOT DELETE THIS LINE -- make depend depends on it.