瀏覽代碼

Regenerated Makefile's after addition of ppas and ppaslink script removal in rev 38745

git-svn-id: trunk@38754 -
pierre 7 年之前
父節點
當前提交
6060f474ed
共有 4 個文件被更改,包括 131 次插入102 次删除
  1. 4 3
      tests/Makefile
  2. 11 5
      tests/tstunits/Makefile
  3. 95 89
      tests/utils/Makefile
  4. 21 5
      tests/utils/testsuite/Makefile

+ 4 - 3
tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2018-03-05 rev 38412]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2018-04-12 rev 38745]
 #
 default: allexectests
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux
@@ -1921,7 +1921,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -1947,7 +1947,7 @@ ifneq ($(PPUEXT),.ppu)
 endif
 	-$(DELTREE) *$(SMARTEXT)
 	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-	-$(DEL) *_ppas$(BATCHEXT)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif
@@ -2471,6 +2471,7 @@ clean_test:
 clean: clean_sources fpc_clean
 	$(MAKE) clean_test CPU_TARGET=$(TEST_CPU_TARGET) OS_TARGET=$(TEST_OS_TARGET) SUBARCH=$(TEST_SUBARCH)
 	$(MAKE) -C tstunits clean CPU_TARGET=$(TEST_CPU_TARGET) OS_TARGET=$(TEST_OS_TARGET) SUBARCH=$(TEST_SUBARCH)
+	-$(DEL) filelisttest.lst filelisttbs.lst filelisttbf.lst filelistwebtbs.lst filelistwebtbf.lst
 distclean: clean fpc_distclean
 	$(DELTREE) output
 	$(MAKE) -C utils distclean

+ 11 - 5
tests/tstunits/Makefile

@@ -1,11 +1,11 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2018-04-12 rev 38745]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
-LIMIT83fs = go32v2 os2 emx watcom msdos win16
+LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
 OSNeedsComspecToRunBatch = go32v2 watcom
 FORCE:
 .PHONY: FORCE
@@ -496,6 +496,9 @@ endif
 ifeq ($(FULL_TARGET),arm-linux)
 override CLEAN_UNITS+=erroru popuperr ptest
 endif
+ifeq ($(FULL_TARGET),arm-netbsd)
+override CLEAN_UNITS+=erroru popuperr ptest
+endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override CLEAN_UNITS+=erroru popuperr ptest
 endif
@@ -749,6 +752,9 @@ endif
 ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
+ifeq ($(FULL_TARGET),arm-netbsd)
+override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
+endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
 endif
@@ -1712,7 +1718,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -1738,7 +1744,7 @@ ifneq ($(PPUEXT),.ppu)
 endif
 	-$(DELTREE) *$(SMARTEXT)
 	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-	-$(DEL) *_ppas$(BATCHEXT)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif

+ 95 - 89
tests/utils/Makefile

@@ -1,11 +1,11 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2018-04-12 rev 38745]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
-LIMIT83fs = go32v2 os2 emx watcom msdos win16
+LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
 OSNeedsComspecToRunBatch = go32v2 watcom
 FORCE:
 .PHONY: FORCE
@@ -501,6 +501,9 @@ endif
 ifeq ($(FULL_TARGET),arm-linux)
 override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
 endif
+ifeq ($(FULL_TARGET),arm-netbsd)
+override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
+endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
 endif
@@ -589,256 +592,259 @@ ifeq ($(FULL_TARGET),sparc64-linux)
 override TARGET_PROGRAMS+=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-android)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i386-aros)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),m68k-macos)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),powerpc-aix)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),x86_64-netbsd)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),x86_64-openbsd)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),x86_64-iphonesim)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),x86_64-aros)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),x86_64-dragonfly)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
+endif
+ifeq ($(FULL_TARGET),arm-netbsd)
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),arm-android)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),arm-aros)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),powerpc64-aix)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),mips-linux)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),mipsel-embedded)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),mipsel-android)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),jvm-java)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),jvm-android)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i8086-embedded)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i8086-msdos)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),i8086-win16)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),aarch64-linux)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),wasm-wasm)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 ifeq ($(FULL_TARGET),sparc64-linux)
-override CLEAN_PROGRAMS+=dbdigest dbconfig
+override CLEAN_PROGRAMS+=dbdigest dbconfig dosbox/dosbox_wrapper
 endif
 override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR
@@ -1881,7 +1887,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -1907,7 +1913,7 @@ ifneq ($(PPUEXT),.ppu)
 endif
 	-$(DELTREE) *$(SMARTEXT)
 	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-	-$(DEL) *_ppas$(BATCHEXT)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif

+ 21 - 5
tests/utils/testsuite/Makefile

@@ -1,11 +1,11 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2018-04-12 rev 38745]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux
 BSDs = freebsd netbsd openbsd darwin dragonfly
 UNIXs = linux $(BSDs) solaris qnx haiku aix
-LIMIT83fs = go32v2 os2 emx watcom msdos win16
+LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
 OSNeedsComspecToRunBatch = go32v2 watcom
 FORCE:
 .PHONY: FORCE
@@ -498,6 +498,9 @@ endif
 ifeq ($(FULL_TARGET),arm-linux)
 override TARGET_PROGRAMS+=testsuite
 endif
+ifeq ($(FULL_TARGET),arm-netbsd)
+override TARGET_PROGRAMS+=testsuite
+endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_PROGRAMS+=testsuite
 endif
@@ -750,6 +753,9 @@ endif
 ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_UNITDIR+=..
 endif
+ifeq ($(FULL_TARGET),arm-netbsd)
+override COMPILER_UNITDIR+=..
+endif
 ifeq ($(FULL_TARGET),arm-palmos)
 override COMPILER_UNITDIR+=..
 endif
@@ -2083,6 +2089,16 @@ REQUIRE_PACKAGES_FPMKUNIT=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-DB=1
 endif
+ifeq ($(FULL_TARGET),arm-netbsd)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+REQUIRE_PACKAGES_HASH=1
+REQUIRE_PACKAGES_LIBTAR=1
+REQUIRE_PACKAGES_FPMKUNIT=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-DB=1
+endif
 ifeq ($(FULL_TARGET),arm-palmos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
@@ -3145,7 +3161,7 @@ ifdef LIB_NAME
 	-$(DEL) $(LIB_NAME) $(LIB_FULLNAME)
 endif
 	-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
+	-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 fpc_cleanall: $(CLEANTARGET)
 ifdef CLEANEXEFILES
 	-$(DEL) $(CLEANEXEFILES)
@@ -3171,7 +3187,7 @@ ifneq ($(PPUEXT),.ppu)
 endif
 	-$(DELTREE) *$(SMARTEXT)
 	-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-	-$(DEL) *_ppas$(BATCHEXT)
+	-$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)
 ifdef AOUTEXT
 	-$(DEL) *$(AOUTEXT)
 endif