Browse Source

+ Added fpcunit

michael 20 years ago
parent
commit
d8b1ea061b
2 changed files with 66 additions and 20 deletions
  1. 65 19
      fcl/Makefile
  2. 1 1
      fcl/Makefile.fpc

+ 65 - 19
fcl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/10/30]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/11/15]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -224,7 +224,7 @@ override PACKAGE_VERSION=1.9.4
 ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
 CLASSES10=classes
 endif
-override TARGET_DIRS+=xml image db shedit passrc net
+override TARGET_DIRS+=xml image db shedit passrc net fpcunit
 override TARGET_UNITS+=$(CLASSES10) contnrs inifiles ezcgi pipes rtfpars idea base64 gettext iostream zstream cachecls avl_tree xmlreg registry eventlog custapp cgiapp wformat whtml wtex rttiutils
 ifeq ($(OS_TARGET),linux)
 override TARGET_UNITS+=process resolve ssockets fpasync syncobjs
@@ -475,14 +475,14 @@ ifeq ($(CPU_TARGET),i386)
 ifneq ($(findstring x86_64,$(shell uname -a)),)
 ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
-else
-GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-name`)
 endif
-else
-GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-name`)
 endif
-else
-GCCLIBDIR:=$(shell dirname `$(BINUTILSPREFIX)gcc -print-libgcc-file-name`)
+endif
+endif
+ifndef GCCLIBDIR
+CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
+ifneq ($(CROSSGCC),)
+GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)
 endif
 endif
 ifndef OTHERLIBDIR
@@ -807,7 +807,7 @@ ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-ECHO= __missing_command__
+ECHO= __missing_command_ECHO
 else
 ECHO:=$(firstword $(ECHO))
 endif
@@ -821,7 +821,7 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE= __missing_command__
+DATE= __missing_command_DATE
 else
 DATE:=$(firstword $(DATE))
 endif
@@ -835,7 +835,7 @@ GINSTALL:=$(strip $(wildcard $(addsuffix /ginstall$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(GINSTALL),)
 GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(GINSTALL),)
-GINSTALL= __missing_command__
+GINSTALL= __missing_command_GINSTALL
 else
 GINSTALL:=$(firstword $(GINSTALL))
 endif
@@ -847,7 +847,7 @@ export GINSTALL
 ifndef CPPROG
 CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(CPPROG),)
-CPPROG= __missing_command__
+CPPROG= __missing_command_CPPROG
 else
 CPPROG:=$(firstword $(CPPROG))
 endif
@@ -856,7 +856,7 @@ export CPPROG
 ifndef RMPROG
 RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(RMPROG),)
-RMPROG= __missing_command__
+RMPROG= __missing_command_RMPROG
 else
 RMPROG:=$(firstword $(RMPROG))
 endif
@@ -865,7 +865,7 @@ export RMPROG
 ifndef MVPROG
 MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(MVPROG),)
-MVPROG= __missing_command__
+MVPROG= __missing_command_MVPROG
 else
 MVPROG:=$(firstword $(MVPROG))
 endif
@@ -876,7 +876,7 @@ MKDIRPROG:=$(strip $(wildcard $(addsuffix /gmkdir$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(MKDIRPROG),)
 MKDIRPROG:=$(strip $(wildcard $(addsuffix /mkdir$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(MKDIRPROG),)
-MKDIRPROG= __missing_command__
+MKDIRPROG= __missing_command_MKDIRPROG
 else
 MKDIRPROG:=$(firstword $(MKDIRPROG))
 endif
@@ -931,7 +931,7 @@ export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
-PPUMOVE= __missing_command__
+PPUMOVE= __missing_command_PPUMOVE
 else
 PPUMOVE:=$(firstword $(PPUMOVE))
 endif
@@ -940,7 +940,7 @@ export PPUMOVE
 ifndef FPCMAKE
 FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(FPCMAKE),)
-FPCMAKE= __missing_command__
+FPCMAKE= __missing_command_FPCMAKE
 else
 FPCMAKE:=$(firstword $(FPCMAKE))
 endif
@@ -949,7 +949,7 @@ export FPCMAKE
 ifndef ZIPPROG
 ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
-ZIPPROG= __missing_command__
+ZIPPROG= __missing_command_ZIPPROG
 else
 ZIPPROG:=$(firstword $(ZIPPROG))
 endif
@@ -958,7 +958,7 @@ export ZIPPROG
 ifndef TARPROG
 TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(TARPROG),)
-TARPROG= __missing_command__
+TARPROG= __missing_command_TARPROG
 else
 TARPROG:=$(firstword $(TARPROG))
 endif
@@ -2210,6 +2210,7 @@ TARGET_DIRS_DB=1
 TARGET_DIRS_SHEDIT=1
 TARGET_DIRS_PASSRC=1
 TARGET_DIRS_NET=1
+TARGET_DIRS_FPCUNIT=1
 ifdef TARGET_DIRS_XML
 xml_all:
 	$(MAKE) -C xml all
@@ -2480,6 +2481,51 @@ net:
 	$(MAKE) -C net all
 .PHONY: net_all net_debug net_smart net_release net_units net_examples net_shared net_install net_sourceinstall net_exampleinstall net_distinstall net_zipinstall net_zipsourceinstall net_zipexampleinstall net_zipdistinstall net_clean net_distclean net_cleanall net_info net_makefiles net
 endif
+ifdef TARGET_DIRS_FPCUNIT
+fpcunit_all:
+	$(MAKE) -C fpcunit all
+fpcunit_debug:
+	$(MAKE) -C fpcunit debug
+fpcunit_smart:
+	$(MAKE) -C fpcunit smart
+fpcunit_release:
+	$(MAKE) -C fpcunit release
+fpcunit_units:
+	$(MAKE) -C fpcunit units
+fpcunit_examples:
+	$(MAKE) -C fpcunit examples
+fpcunit_shared:
+	$(MAKE) -C fpcunit shared
+fpcunit_install:
+	$(MAKE) -C fpcunit install
+fpcunit_sourceinstall:
+	$(MAKE) -C fpcunit sourceinstall
+fpcunit_exampleinstall:
+	$(MAKE) -C fpcunit exampleinstall
+fpcunit_distinstall:
+	$(MAKE) -C fpcunit distinstall
+fpcunit_zipinstall:
+	$(MAKE) -C fpcunit zipinstall
+fpcunit_zipsourceinstall:
+	$(MAKE) -C fpcunit zipsourceinstall
+fpcunit_zipexampleinstall:
+	$(MAKE) -C fpcunit zipexampleinstall
+fpcunit_zipdistinstall:
+	$(MAKE) -C fpcunit zipdistinstall
+fpcunit_clean:
+	$(MAKE) -C fpcunit clean
+fpcunit_distclean:
+	$(MAKE) -C fpcunit distclean
+fpcunit_cleanall:
+	$(MAKE) -C fpcunit cleanall
+fpcunit_info:
+	$(MAKE) -C fpcunit info
+fpcunit_makefiles:
+	$(MAKE) -C fpcunit makefiles
+fpcunit:
+	$(MAKE) -C fpcunit all
+.PHONY: fpcunit_all fpcunit_debug fpcunit_smart fpcunit_release fpcunit_units fpcunit_examples fpcunit_shared fpcunit_install fpcunit_sourceinstall fpcunit_exampleinstall fpcunit_distinstall fpcunit_zipinstall fpcunit_zipsourceinstall fpcunit_zipexampleinstall fpcunit_zipdistinstall fpcunit_clean fpcunit_distclean fpcunit_cleanall fpcunit_info fpcunit_makefiles fpcunit
+endif
 TARGET_EXAMPLEDIRS_TESTS=1
 ifdef TARGET_EXAMPLEDIRS_TESTS
 tests_all:

+ 1 - 1
fcl/Makefile.fpc

@@ -20,7 +20,7 @@ packages_win32=netdb
 units=adler gzcrc gzio infblock infcodes inffast inftrees infutil minigzip paszlib trees zbase zcompres zdeflate zinflate zuncompr zutil pthreads
 
 [target]
-dirs=xml image db shedit passrc net
+dirs=xml image db shedit passrc net fpcunit
 units=$(CLASSES10) contnrs inifiles ezcgi pipes rtfpars idea base64 gettext \
       iostream zstream cachecls avl_tree xmlreg registry eventlog custapp cgiapp \
       wformat whtml wtex rttiutils