+ Added unitdiff

This commit is contained in:
michael 2004-11-14 21:24:10 +00:00
parent b9f07753be
commit fca81e8e76
2 changed files with 81 additions and 154 deletions

View File

@ -1,11 +1,10 @@
# #
# 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/08/31]
# #
default: all default: all
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos
BSDs = freebsd netbsd openbsd darwin BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) sunos qnx UNIXs = linux $(BSDs) sunos qnx
LIMIT83fs = go32v2 os2
FORCE: FORCE:
.PHONY: FORCE .PHONY: FORCE
override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH))) override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))
@ -146,13 +145,8 @@ endif
ifndef OS_TARGET ifndef OS_TARGET
OS_TARGET:=$(word 5,$(FPC_COMPILERINFO)) OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
endif endif
ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
FULL_TARGET=$(OS_TARGET)
FULL_SOURCE=$(OS_SOURCE)
else
FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
endif
ifneq ($(FULL_TARGET),$(FULL_SOURCE)) ifneq ($(FULL_TARGET),$(FULL_SOURCE))
CROSSCOMPILE=1 CROSSCOMPILE=1
endif endif
@ -204,24 +198,24 @@ endif
endif endif
endif endif
endif endif
ifndef CROSSBINDIR ifndef CROSSDIR
CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(FULL_TARGET)) CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
endif
ifndef CROSSTARGETDIR
CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
endif endif
ifndef BINUTILSPREFIX
ifndef CROSSBINDIR
ifdef CROSSCOMPILE ifdef CROSSCOMPILE
BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
endif
endif
endif
UNITSDIR:=$(wildcard $(FPCDIR)/units/$(FULL_TARGET))
ifeq ($(UNITSDIR),) ifeq ($(UNITSDIR),)
UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
endif endif
else
UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
endif
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
override PACKAGE_NAME=fpdoc override PACKAGE_NAME=fpdoc
override PACKAGE_VERSION=1.9.4 override PACKAGE_VERSION=1.9.4
override TARGET_PROGRAMS+=fpdoc makeskel override TARGET_PROGRAMS+=fpdoc makeskel unitdiff
override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf override CLEAN_UNITS+=dglobals dwriter dw_xml sh_pas dw_html dw_latex dw_ipf
override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst override CLEAN_FILES+=dwriter.rst fpdoc.rst dglobals.rst makeskel.rst
override INSTALL_FPCPACKAGE=y override INSTALL_FPCPACKAGE=y
@ -265,16 +259,6 @@ ifndef DIST_DESTDIR
DIST_DESTDIR:=$(BASEDIR) DIST_DESTDIR:=$(BASEDIR)
endif endif
export DIST_DESTDIR export DIST_DESTDIR
ifndef COMPILER_UNITTARGETDIR
ifdef PACKAGEDIR_MAIN
COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(FULL_TARGET)
else
COMPILER_UNITTARGETDIR=units/$(FULL_TARGET)
endif
endif
ifndef COMPILER_TARGETDIR
COMPILER_TARGETDIR=.
endif
ifndef INSTALL_BASEDIR ifndef INSTALL_BASEDIR
ifdef UNIXHier ifdef UNIXHier
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
@ -288,16 +272,28 @@ endif
endif endif
ifndef INSTALL_BINDIR ifndef INSTALL_BINDIR
ifdef UNIXHier ifdef UNIXHier
ifdef CROSSCOMPILE
INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
else
INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
endif
else
ifdef CROSSCOMPILE
INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
else else
INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
endif
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(FULL_SOURCE) INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
endif endif
endif endif
endif endif
ifndef INSTALL_UNITDIR ifndef INSTALL_UNITDIR
INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(FULL_TARGET) ifdef CROSSCOMPILE
INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/units
else
INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)
endif
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
ifdef PACKAGE_NAME ifdef PACKAGE_NAME
INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME) INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)
@ -449,20 +445,21 @@ STATICLIBEXT=.a
SHAREDLIBEXT=.so SHAREDLIBEXT=.so
STATICLIBPREFIX=libp STATICLIBPREFIX=libp
RSTEXT=.rst RSTEXT=.rst
FPCMADE=fpcmade
ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
ifeq ($(OS_TARGET),go32v1) ifeq ($(OS_TARGET),go32v1)
STATICLIBPREFIX= STATICLIBPREFIX=
FPCMADEEXT=v1 FPCMADE=fpcmade.v1
PACKAGESUFFIX=v1 PACKAGESUFFIX=v1
endif endif
ifeq ($(OS_TARGET),go32v2) ifeq ($(OS_TARGET),go32v2)
STATICLIBPREFIX= STATICLIBPREFIX=
FPCMADEEXT=dos FPCMADE=fpcmade.dos
ZIPSUFFIX=go32 ZIPSUFFIX=go32
endif endif
ifeq ($(OS_TARGET),watcom) ifeq ($(OS_TARGET),watcom)
STATICLIBPREFIX= STATICLIBPREFIX=
FPCMADEEXT=wat FPCMADE=fpcmade.wat
ZIPSUFFIX=watc ZIPSUFFIX=watc
OEXT=.obj OEXT=.obj
ASMEXT=.asm ASMEXT=.asm
@ -472,33 +469,33 @@ ifeq ($(OS_TARGET),linux)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADEEXT=lnx FPCMADE=fpcmade.lnx
ZIPSUFFIX=linux ZIPSUFFIX=linux
endif endif
ifeq ($(OS_TARGET),freebsd) ifeq ($(OS_TARGET),freebsd)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADEEXT=fbs FPCMADE=fpcmade.freebsd
ZIPSUFFIX=freebsd ZIPSUFFIX=freebsd
endif endif
ifeq ($(OS_TARGET),netbsd) ifeq ($(OS_TARGET),netbsd)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADEEXT=nbs FPCMADE=fpcmade.netbsd
ZIPSUFFIX=netbsd ZIPSUFFIX=netbsd
endif endif
ifeq ($(OS_TARGET),openbsd) ifeq ($(OS_TARGET),openbsd)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADEEXT=obs FPCMADE=fpcmade.openbsd
ZIPSUFFIX=openbsd ZIPSUFFIX=openbsd
endif endif
ifeq ($(OS_TARGET),win32) ifeq ($(OS_TARGET),win32)
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
FPCMADEEXT=w32 FPCMADE=fpcmade.w32
ZIPSUFFIX=w32 ZIPSUFFIX=w32
endif endif
ifeq ($(OS_TARGET),os2) ifeq ($(OS_TARGET),os2)
@ -506,7 +503,7 @@ BATCHEXT=.cmd
AOUTEXT=.out AOUTEXT=.out
STATICLIBPREFIX= STATICLIBPREFIX=
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
FPCMADEEXT=os2 FPCMADE=fpcmade.os2
ZIPSUFFIX=os2 ZIPSUFFIX=os2
ECHO=echo ECHO=echo
endif endif
@ -515,73 +512,62 @@ BATCHEXT=.cmd
AOUTEXT=.out AOUTEXT=.out
STATICLIBPREFIX= STATICLIBPREFIX=
SHAREDLIBEXT=.dll SHAREDLIBEXT=.dll
FPCMADEEXT=emx FPCMADE=fpcmade.emx
ZIPSUFFIX=emx ZIPSUFFIX=emx
ECHO=echo ECHO=echo
endif endif
ifeq ($(OS_TARGET),amiga) ifeq ($(OS_TARGET),amiga)
EXEEXT= EXEEXT=
SHAREDLIBEXT=.library SHAREDLIBEXT=.library
FPCMADEEXT=amg FPCMADE=fpcmade.amg
endif endif
ifeq ($(OS_TARGET),morphos) ifeq ($(OS_TARGET),morphos)
EXEEXT= EXEEXT=
SHAREDLIBEXT=.library SHAREDLIBEXT=.library
FPCMADEEXT=mos FPCMADE=fpcmade.mos
endif endif
ifeq ($(OS_TARGET),atari) ifeq ($(OS_TARGET),atari)
EXEEXT=.ttp EXEEXT=.ttp
FPCMADEEXT=ata FPCMADE=fpcmade.ata
endif endif
ifeq ($(OS_TARGET),beos) ifeq ($(OS_TARGET),beos)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
FPCMADEEXT=be FPCMADE=fpcmade.be
ZIPSUFFIX=be ZIPSUFFIX=be
endif endif
ifeq ($(OS_TARGET),sunos) ifeq ($(OS_TARGET),sunos)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
FPCMADEEXT=sun FPCMADE=fpcmade.sun
ZIPSUFFIX=sun ZIPSUFFIX=sun
endif endif
ifeq ($(OS_TARGET),qnx) ifeq ($(OS_TARGET),qnx)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
FPCMADEEXT=qnx FPCMADE=fpcmade.qnx
ZIPSUFFIX=qnx ZIPSUFFIX=qnx
endif endif
ifeq ($(OS_TARGET),netware) ifeq ($(OS_TARGET),netware)
EXEEXT=.nlm EXEEXT=.nlm
STATICLIBPREFIX= STATICLIBPREFIX=
FPCMADEEXT=nw FPCMADE=fpcmade.nw
ZIPSUFFIX=nw ZIPSUFFIX=nw
endif endif
ifeq ($(OS_TARGET),netwlibc)
EXEEXT=.nlm
STATICLIBPREFIX=
FPCMADEEXT=nwl
ZIPSUFFIX=nwl
endif
ifeq ($(OS_TARGET),macos) ifeq ($(OS_TARGET),macos)
BATCHEXT= BATCHEXT=
EXEEXT= EXEEXT=
FPCMADEEXT=mac FPCMADE=fpcmade.macos
ZIPSUFFIX=macos ZIPSUFFIX=macos
DEBUGSYMEXT=.xcoff DEBUGSYMEXT=.xcoff
endif endif
ifeq ($(OS_TARGET),darwin) ifeq ($(OS_TARGET),darwin)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
FPCMADEEXT=dwn
HASSHAREDLIB=1 HASSHAREDLIB=1
FPCMADE=fpcmade.darwin
ZIPSUFFIX=darwin ZIPSUFFIX=darwin
endif endif
ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
FPCMADE=fpcmade$(FPCMADEEXT)
else
FPCMADE=fpcmade.$(FULL_TARGET)
endif
else else
ifeq ($(OS_TARGET),go32v1) ifeq ($(OS_TARGET),go32v1)
PPUEXT=.pp1 PPUEXT=.pp1
@ -720,18 +706,6 @@ FPCMADE=fpcmade.nw
ZIPSUFFIX=nw ZIPSUFFIX=nw
EXEEXT=.nlm EXEEXT=.nlm
endif endif
ifeq ($(OS_TARGET),netwlibc)
STATICLIBPREFIX=
PPUEXT=.ppu
OEXT=.o
ASMEXT=.s
SMARTEXT=.sl
STATICLIBEXT=.a
SHAREDLIBEXT=.nlm
FPCMADE=fpcmade.nwl
ZIPSUFFIX=nwl
EXEEXT=.nlm
endif
ifeq ($(OS_TARGET),macos) ifeq ($(OS_TARGET),macos)
BATCHEXT= BATCHEXT=
PPUEXT=.ppu PPUEXT=.ppu
@ -813,20 +787,6 @@ MVPROG:=$(firstword $(MVPROG))
endif endif
endif endif
export MVPROG export MVPROG
ifndef MKDIRPROG
MKDIRPROG:=$(strip $(wildcard $(addsuffix /gmkdir$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(MKDIRPROG),)
MKDIRPROG:=$(strip $(wildcard $(addsuffix /mkdir$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(MKDIRPROG),)
MKDIRPROG= __missing_command__
else
MKDIRPROG:=$(firstword $(MKDIRPROG))
endif
else
MKDIRPROG:=$(firstword $(MKDIRPROG))
endif
endif
export MKDIRPROG
ifndef ECHOREDIR ifndef ECHOREDIR
ifndef inUnix ifndef inUnix
ECHOREDIR=echo ECHOREDIR=echo
@ -838,10 +798,7 @@ ifndef COPY
COPY:=$(CPPROG) -fp COPY:=$(CPPROG) -fp
endif endif
ifndef COPYTREE ifndef COPYTREE
COPYTREE:=$(CPPROG) -Rfp COPYTREE:=$(CPPROG) -rfp
endif
ifndef MKDIRTREE
MKDIRTREE:=$(MKDIRPROG) -p
endif endif
ifndef MOVE ifndef MOVE
MOVE:=$(MVPROG) -f MOVE:=$(MVPROG) -f
@ -1389,21 +1346,11 @@ REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1 REQUIRE_PACKAGES_LIBASYNC=1
endif endif
endif endif
ifeq ($(OS_TARGET),netwlibc)
ifeq ($(CPU_TARGET),i386)
REQUIRE_PACKAGES_RTL=1
REQUIRE_PACKAGES_PASZLIB=1
REQUIRE_PACKAGES_FCL=1
REQUIRE_PACKAGES_PASJPEG=1
REQUIRE_PACKAGES_NETDB=1
REQUIRE_PACKAGES_LIBASYNC=1
endif
endif
ifdef REQUIRE_PACKAGES_RTL ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),) ifneq ($(PACKAGEDIR_RTL),)
ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(FULL_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_RTL)/$(OS_TARGET)),)
UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(FULL_TARGET) UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
else else
UNITDIR_RTL=$(PACKAGEDIR_RTL) UNITDIR_RTL=$(PACKAGEDIR_RTL)
endif endif
@ -1428,8 +1375,8 @@ endif
ifdef REQUIRE_PACKAGES_PASZLIB ifdef REQUIRE_PACKAGES_PASZLIB
PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_PASZLIB),) ifneq ($(PACKAGEDIR_PASZLIB),)
ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(FULL_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/$(OS_TARGET)),)
UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(FULL_TARGET) UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/$(OS_TARGET)
else else
UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
endif endif
@ -1454,8 +1401,8 @@ endif
ifdef REQUIRE_PACKAGES_NETDB ifdef REQUIRE_PACKAGES_NETDB
PACKAGEDIR_NETDB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /netdb/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_NETDB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /netdb/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_NETDB),) ifneq ($(PACKAGEDIR_NETDB),)
ifneq ($(wildcard $(PACKAGEDIR_NETDB)/units/$(FULL_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_NETDB)/$(OS_TARGET)),)
UNITDIR_NETDB=$(PACKAGEDIR_NETDB)/units/$(FULL_TARGET) UNITDIR_NETDB=$(PACKAGEDIR_NETDB)/$(OS_TARGET)
else else
UNITDIR_NETDB=$(PACKAGEDIR_NETDB) UNITDIR_NETDB=$(PACKAGEDIR_NETDB)
endif endif
@ -1480,8 +1427,8 @@ endif
ifdef REQUIRE_PACKAGES_LIBASYNC ifdef REQUIRE_PACKAGES_LIBASYNC
PACKAGEDIR_LIBASYNC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libasync/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_LIBASYNC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libasync/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_LIBASYNC),) ifneq ($(PACKAGEDIR_LIBASYNC),)
ifneq ($(wildcard $(PACKAGEDIR_LIBASYNC)/units/$(FULL_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_LIBASYNC)/$(OS_TARGET)),)
UNITDIR_LIBASYNC=$(PACKAGEDIR_LIBASYNC)/units/$(FULL_TARGET) UNITDIR_LIBASYNC=$(PACKAGEDIR_LIBASYNC)/$(OS_TARGET)
else else
UNITDIR_LIBASYNC=$(PACKAGEDIR_LIBASYNC) UNITDIR_LIBASYNC=$(PACKAGEDIR_LIBASYNC)
endif endif
@ -1506,8 +1453,8 @@ endif
ifdef REQUIRE_PACKAGES_PTHREADS ifdef REQUIRE_PACKAGES_PTHREADS
PACKAGEDIR_PTHREADS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pthreads/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_PTHREADS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pthreads/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_PTHREADS),) ifneq ($(PACKAGEDIR_PTHREADS),)
ifneq ($(wildcard $(PACKAGEDIR_PTHREADS)/units/$(FULL_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_PTHREADS)/$(OS_TARGET)),)
UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)/units/$(FULL_TARGET) UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)/$(OS_TARGET)
else else
UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS) UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)
endif endif
@ -1532,8 +1479,8 @@ endif
ifdef REQUIRE_PACKAGES_FCL ifdef REQUIRE_PACKAGES_FCL
PACKAGEDIR_FCL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_FCL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_FCL),) ifneq ($(PACKAGEDIR_FCL),)
ifneq ($(wildcard $(PACKAGEDIR_FCL)/units/$(FULL_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_FCL)/$(OS_TARGET)),)
UNITDIR_FCL=$(PACKAGEDIR_FCL)/units/$(FULL_TARGET) UNITDIR_FCL=$(PACKAGEDIR_FCL)/$(OS_TARGET)
else else
UNITDIR_FCL=$(PACKAGEDIR_FCL) UNITDIR_FCL=$(PACKAGEDIR_FCL)
endif endif
@ -1558,8 +1505,8 @@ endif
ifdef REQUIRE_PACKAGES_PASJPEG ifdef REQUIRE_PACKAGES_PASJPEG
PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_PASJPEG:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pasjpeg/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_PASJPEG),) ifneq ($(PACKAGEDIR_PASJPEG),)
ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/units/$(FULL_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_PASJPEG)/$(OS_TARGET)),)
UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/units/$(FULL_TARGET) UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)/$(OS_TARGET)
else else
UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG) UNITDIR_PASJPEG=$(PACKAGEDIR_PASJPEG)
endif endif
@ -1584,8 +1531,8 @@ endif
ifdef REQUIRE_PACKAGES_IBASE ifdef REQUIRE_PACKAGES_IBASE
PACKAGEDIR_IBASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ibase/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_IBASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ibase/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_IBASE),) ifneq ($(PACKAGEDIR_IBASE),)
ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units/$(FULL_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_IBASE)/$(OS_TARGET)),)
UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/units/$(FULL_TARGET) UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/$(OS_TARGET)
else else
UNITDIR_IBASE=$(PACKAGEDIR_IBASE) UNITDIR_IBASE=$(PACKAGEDIR_IBASE)
endif endif
@ -1610,8 +1557,8 @@ endif
ifdef REQUIRE_PACKAGES_POSTGRES ifdef REQUIRE_PACKAGES_POSTGRES
PACKAGEDIR_POSTGRES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /postgres/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_POSTGRES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /postgres/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_POSTGRES),) ifneq ($(PACKAGEDIR_POSTGRES),)
ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units/$(FULL_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/$(OS_TARGET)),)
UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(FULL_TARGET) UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)/$(OS_TARGET)
else else
UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES) UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)
endif endif
@ -1636,8 +1583,8 @@ endif
ifdef REQUIRE_PACKAGES_MYSQL ifdef REQUIRE_PACKAGES_MYSQL
PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_MYSQL),) ifneq ($(PACKAGEDIR_MYSQL),)
ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units/$(FULL_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/$(OS_TARGET)),)
UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(FULL_TARGET) UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/$(OS_TARGET)
else else
UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL) UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)
endif endif
@ -1662,8 +1609,8 @@ endif
ifdef REQUIRE_PACKAGES_SQLITE ifdef REQUIRE_PACKAGES_SQLITE
PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_SQLITE),) ifneq ($(PACKAGEDIR_SQLITE),)
ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units/$(FULL_TARGET)),) ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/$(OS_TARGET)),)
UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(FULL_TARGET) UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)/$(OS_TARGET)
else else
UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE) UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)
endif endif
@ -1821,7 +1768,6 @@ EXECPPAS:=@$(PPAS)
endif endif
endif endif
.PHONY: fpc_exes .PHONY: fpc_exes
ifndef CROSSINSTALL
ifneq ($(TARGET_PROGRAMS),) ifneq ($(TARGET_PROGRAMS),)
override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS)) override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))
override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))
@ -1835,8 +1781,7 @@ ifeq ($(OS_TARGET),emx)
override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS)) override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
endif endif
endif endif
endif fpc_exes: $(EXEFILES)
fpc_exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES)
ifdef TARGET_RSTS ifdef TARGET_RSTS
override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
override CLEANRSTFILES+=$(RSTFILES) override CLEANRSTFILES+=$(RSTFILES)
@ -1852,10 +1797,6 @@ fpc_debug:
fpc_release: fpc_release:
$(MAKE) all RELEASE=1 $(MAKE) all RELEASE=1
.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res .SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
$(COMPILER_UNITTARGETDIR):
$(MKDIRTREE) $(COMPILER_UNITTARGETDIR)
$(COMPILER_TARGETDIR):
$(MKDIRTREE) $(COMPILER_TARGETDIR)
%$(PPUEXT): %.pp %$(PPUEXT): %.pp
$(COMPILER) $< $(COMPILER) $<
$(EXECPPAS) $(EXECPPAS)
@ -1880,7 +1821,6 @@ vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR) vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
ifdef INSTALL_UNITS ifdef INSTALL_UNITS
@ -2063,28 +2003,17 @@ ifdef LIB_NAME
endif endif
-$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)
fpc_cleanall: $(CLEANTARGET) fpc_distclean: clean
ifdef COMPILER_UNITTARGETDIR
TARGETDIRCLEAN=fpc_clean
endif
fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)
ifdef CLEANEXEFILES ifdef CLEANEXEFILES
-$(DEL) $(CLEANEXEFILES) -$(DEL) $(CLEANEXEFILES)
endif endif
ifdef COMPILER_UNITTARGETDIR
ifdef CLEANPPUFILES
-$(DEL) $(CLEANPPUFILES)
endif
ifneq ($(CLEANPPULINKFILES),)
-$(DEL) $(CLEANPPULINKFILES)
endif
ifdef CLEANRSTFILES
-$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))
endif
endif
-$(DELTREE) units
-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
ifneq ($(PPUEXT),.ppu)
-$(DEL) *.o *.ppu *.a
endif
-$(DELTREE) *$(SMARTEXT) -$(DELTREE) *$(SMARTEXT)
-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE) -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(FPCEXTFILE) $(REDIRFILE)
-$(DEL) *_ppas$(BATCHEXT) -$(DEL) *_ppas$(BATCHEXT)
ifdef AOUTEXT ifdef AOUTEXT
-$(DEL) *$(AOUTEXT) -$(DEL) *$(AOUTEXT)
@ -2092,7 +2021,6 @@ endif
ifdef DEBUGSYMEXT ifdef DEBUGSYMEXT
-$(DEL) *$(DEBUGSYMEXT) -$(DEL) *$(DEBUGSYMEXT)
endif endif
fpc_distclean: cleanall
.PHONY: fpc_baseinfo .PHONY: fpc_baseinfo
override INFORULES+=fpc_baseinfo override INFORULES+=fpc_baseinfo
fpc_baseinfo: fpc_baseinfo:
@ -2199,7 +2127,6 @@ all: fpc_all
debug: fpc_debug debug: fpc_debug
smart: fpc_smart smart: fpc_smart
release: fpc_release release: fpc_release
units: fpc_units
examples: examples:
shared: shared:
install: fpc_install install: fpc_install
@ -2215,7 +2142,7 @@ distclean: fpc_distclean
cleanall: fpc_cleanall cleanall: fpc_cleanall
info: fpc_info info: fpc_info
makefiles: fpc_makefiles makefiles: fpc_makefiles
.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles .PHONY: all debug smart release examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
ifneq ($(wildcard fpcmake.loc),) ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc include fpcmake.loc
endif endif

View File

@ -10,7 +10,7 @@ version=1.9.4
packages=fcl packages=fcl
[target] [target]
programs=fpdoc makeskel programs=fpdoc makeskel unitdiff
rst=dwriter fpdoc dglobals makeskel rst=dwriter fpdoc dglobals makeskel
# removed to reduce dependencies of rpm. # removed to reduce dependencies of rpm.
#dirs_linux_i386=fpde #dirs_linux_i386=fpde