diff --git a/fcl/fpcunit/Makefile b/fcl/fpcunit/Makefile index a301e6e544..9bd9c8df05 100644 --- a/fcl/fpcunit/Makefile +++ b/fcl/fpcunit/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/11/26] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/03] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) sunos qnx -LIMIT83fs = go32v2 os2 +LIMIT83fs = go32v2 os2 emx watcom FORCE: .PHONY: FORCE override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) @@ -222,7 +222,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/ext override PACKAGE_NAME=fcl PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR)))))) override TARGET_UNITS+=fpcunit testregistry testreport testutils -override TARGET_EXAMPLEDIRS+=exampletests tests +override TARGET_EXAMPLEDIRS+=exampletests override INSTALL_FPCPACKAGE=y override COMPILER_OPTIONS+=-S2h override COMPILER_TARGETDIR+=../$(OS_TARGET) @@ -560,7 +560,7 @@ HASSHAREDLIB=1 ZIPSUFFIX=darwin endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) -FPCMADE=fpcmade$(FPCMADEEXT) +FPCMADE=fpcmade.$(FPCMADEEXT) else FPCMADE=fpcmade.$(FULL_TARGET) endif @@ -1600,7 +1600,6 @@ fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIR fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs TARGET_EXAMPLEDIRS_EXAMPLETESTS=1 -TARGET_EXAMPLEDIRS_TESTS=1 ifdef TARGET_EXAMPLEDIRS_EXAMPLETESTS exampletests_all: $(MAKE) -C exampletests all @@ -1646,51 +1645,6 @@ exampletests: $(MAKE) -C exampletests all .PHONY: exampletests_all exampletests_debug exampletests_smart exampletests_release exampletests_units exampletests_examples exampletests_shared exampletests_install exampletests_sourceinstall exampletests_exampleinstall exampletests_distinstall exampletests_zipinstall exampletests_zipsourceinstall exampletests_zipexampleinstall exampletests_zipdistinstall exampletests_clean exampletests_distclean exampletests_cleanall exampletests_info exampletests_makefiles exampletests endif -ifdef TARGET_EXAMPLEDIRS_TESTS -tests_all: - $(MAKE) -C tests all -tests_debug: - $(MAKE) -C tests debug -tests_smart: - $(MAKE) -C tests smart -tests_release: - $(MAKE) -C tests release -tests_units: - $(MAKE) -C tests units -tests_examples: - $(MAKE) -C tests examples -tests_shared: - $(MAKE) -C tests shared -tests_install: - $(MAKE) -C tests install -tests_sourceinstall: - $(MAKE) -C tests sourceinstall -tests_exampleinstall: - $(MAKE) -C tests exampleinstall -tests_distinstall: - $(MAKE) -C tests distinstall -tests_zipinstall: - $(MAKE) -C tests zipinstall -tests_zipsourceinstall: - $(MAKE) -C tests zipsourceinstall -tests_zipexampleinstall: - $(MAKE) -C tests zipexampleinstall -tests_zipdistinstall: - $(MAKE) -C tests zipdistinstall -tests_clean: - $(MAKE) -C tests clean -tests_distclean: - $(MAKE) -C tests distclean -tests_cleanall: - $(MAKE) -C tests cleanall -tests_info: - $(MAKE) -C tests info -tests_makefiles: - $(MAKE) -C tests makefiles -tests: - $(MAKE) -C tests all -.PHONY: tests_all tests_debug tests_smart tests_release tests_units tests_examples tests_shared tests_install tests_sourceinstall tests_exampleinstall tests_distinstall tests_zipinstall tests_zipsourceinstall tests_zipexampleinstall tests_zipdistinstall tests_clean tests_distclean tests_cleanall tests_info tests_makefiles tests -endif all: fpc_all debug: fpc_debug smart: fpc_smart diff --git a/fcl/fpcunit/Makefile.fpc b/fcl/fpcunit/Makefile.fpc index af8aabf02b..6aac9931dc 100644 --- a/fcl/fpcunit/Makefile.fpc +++ b/fcl/fpcunit/Makefile.fpc @@ -7,7 +7,7 @@ main=fcl [target] units=fpcunit testregistry testreport testutils -exampledirs=exampletests tests +exampledirs=exampletests [compiler] options=-S2h