* fixed typo GRPAH to GRAPH

git-svn-id: trunk@2246 -
This commit is contained in:
peter 2006-01-10 09:01:27 +00:00
parent d87a52fcca
commit 36ae732398
2 changed files with 2217 additions and 2182 deletions

View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/11/12] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/01/10]
# #
default: all default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@ -255,7 +255,7 @@ GRAPHUNIT_DIR=unix
UNIXINCDEPS=$(UNIXINC)/graph16.inc UNIXINCDEPS=$(UNIXINC)/graph16.inc
endif endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override TARGET_UNITS+=$(GRPAH_UNIT) $(GGIGRAPH_UNIT) override TARGET_UNITS+=$(GRAPH_UNIT) $(GGIGRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-go32v2) ifeq ($(FULL_TARGET),i386-go32v2)
override TARGET_UNITS+=graph override TARGET_UNITS+=graph
@ -267,7 +267,7 @@ ifeq ($(FULL_TARGET),i386-freebsd)
override TARGET_UNITS+=graph $(GGIGRAPH_UNIT) override TARGET_UNITS+=graph $(GGIGRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_UNITS+=$(GRPAH_UNIT) $(GGIGRAPH_UNIT) override TARGET_UNITS+=$(GRAPH_UNIT) $(GGIGRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),m68k-freebsd) ifeq ($(FULL_TARGET),m68k-freebsd)
override TARGET_UNITS+=graph $(GGIGRAPH_UNIT) override TARGET_UNITS+=graph $(GGIGRAPH_UNIT)
@ -276,133 +276,133 @@ ifeq ($(FULL_TARGET),m68k-amiga)
override TARGET_UNITS+=graph override TARGET_UNITS+=graph
endif endif
ifeq ($(FULL_TARGET),powerpc-linux) ifeq ($(FULL_TARGET),powerpc-linux)
override TARGET_UNITS+=$(GRPAH_UNIT) $(GGIGRAPH_UNIT) override TARGET_UNITS+=$(GRAPH_UNIT) $(GGIGRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),sparc-linux) ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_UNITS+=$(GRPAH_UNIT) $(GGIGRAPH_UNIT) override TARGET_UNITS+=$(GRAPH_UNIT) $(GGIGRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),x86_64-linux) ifeq ($(FULL_TARGET),x86_64-linux)
override TARGET_UNITS+=$(GRPAH_UNIT) $(GGIGRAPH_UNIT) override TARGET_UNITS+=$(GRAPH_UNIT) $(GGIGRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_UNITS+=graph $(GGIGRAPH_UNIT) override TARGET_UNITS+=graph $(GGIGRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),arm-linux) ifeq ($(FULL_TARGET),arm-linux)
override TARGET_UNITS+=$(GRPAH_UNIT) $(GGIGRAPH_UNIT) override TARGET_UNITS+=$(GRAPH_UNIT) $(GGIGRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override TARGET_UNITS+=$(GRPAH_UNIT) $(GGIGRAPH_UNIT) override TARGET_UNITS+=$(GRAPH_UNIT) $(GGIGRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-go32v2) ifeq ($(FULL_TARGET),i386-go32v2)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-win32) ifeq ($(FULL_TARGET),i386-win32)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-os2) ifeq ($(FULL_TARGET),i386-os2)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-freebsd) ifeq ($(FULL_TARGET),i386-freebsd)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-solaris) ifeq ($(FULL_TARGET),i386-solaris)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-qnx) ifeq ($(FULL_TARGET),i386-qnx)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-netware) ifeq ($(FULL_TARGET),i386-netware)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-openbsd) ifeq ($(FULL_TARGET),i386-openbsd)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-wdosx) ifeq ($(FULL_TARGET),i386-wdosx)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-emx) ifeq ($(FULL_TARGET),i386-emx)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-watcom) ifeq ($(FULL_TARGET),i386-watcom)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-netwlibc) ifeq ($(FULL_TARGET),i386-netwlibc)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),i386-wince) ifeq ($(FULL_TARGET),i386-wince)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),m68k-freebsd) ifeq ($(FULL_TARGET),m68k-freebsd)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),m68k-netbsd) ifeq ($(FULL_TARGET),m68k-netbsd)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),m68k-amiga) ifeq ($(FULL_TARGET),m68k-amiga)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),m68k-atari) ifeq ($(FULL_TARGET),m68k-atari)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),m68k-openbsd) ifeq ($(FULL_TARGET),m68k-openbsd)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),m68k-palmos) ifeq ($(FULL_TARGET),m68k-palmos)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),powerpc-linux) ifeq ($(FULL_TARGET),powerpc-linux)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),powerpc-netbsd) ifeq ($(FULL_TARGET),powerpc-netbsd)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),powerpc-macos) ifeq ($(FULL_TARGET),powerpc-macos)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),powerpc-darwin) ifeq ($(FULL_TARGET),powerpc-darwin)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),powerpc-morphos) ifeq ($(FULL_TARGET),powerpc-morphos)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),sparc-linux) ifeq ($(FULL_TARGET),sparc-linux)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),sparc-netbsd) ifeq ($(FULL_TARGET),sparc-netbsd)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),sparc-solaris) ifeq ($(FULL_TARGET),sparc-solaris)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),x86_64-linux) ifeq ($(FULL_TARGET),x86_64-linux)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),x86_64-win64) ifeq ($(FULL_TARGET),x86_64-win64)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),arm-linux) ifeq ($(FULL_TARGET),arm-linux)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) override CLEAN_UNITS+=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
endif endif
override INSTALL_FPCPACKAGE=y override INSTALL_FPCPACKAGE=y
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
@ -967,6 +967,7 @@ ASMEXT=.s
SMARTEXT=.sl SMARTEXT=.sl
STATICLIBEXT=.a STATICLIBEXT=.a
SHAREDLIBEXT=.so SHAREDLIBEXT=.so
SHAREDLIBPREFIX=libfp
STATICLIBPREFIX=libp STATICLIBPREFIX=libp
RSTEXT=.rst RSTEXT=.rst
ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
@ -1737,6 +1738,12 @@ ifeq ($(FPC_VERSION),1.0.6)
override FPCOPTDEF+=HASUNIX override FPCOPTDEF+=HASUNIX
endif endif
endif endif
ifdef CREATESHARED
override FPCOPT+=-Cg
ifeq ($(CPU_TARGET),i386)
override FPCOPT+=-Aas
endif
endif
ifdef GCCLIBDIR ifdef GCCLIBDIR
override FPCOPT+=-Fl$(GCCLIBDIR) override FPCOPT+=-Fl$(GCCLIBDIR)
endif endif
@ -1757,6 +1764,14 @@ override FPCEXTCMD:=$(FPCOPT)
override FPCOPT:=!FPCEXTCMD override FPCOPT:=!FPCEXTCMD
export FPCEXTCMD export FPCEXTCMD
endif endif
override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))
override ACROSSCOMPILE=1
endif
ifdef ACROSSCOMPILE
override FPCOPT+=$(CROSSOPT)
endif
override COMPILER:=$(FPC) $(FPCOPT) override COMPILER:=$(FPC) $(FPCOPT)
ifeq (,$(findstring -s ,$(COMPILER))) ifeq (,$(findstring -s ,$(COMPILER)))
EXECPPAS= EXECPPAS=
@ -1819,6 +1834,26 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
vpath %$(OEXT) $(COMPILER_UNITTARGETDIR) vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR) vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
.PHONY: fpc_shared
ifndef SHARED_LIBVERSION
SHARED_LIBVERSION=$(FPC_VERSION)
endif
ifndef $(SHARED_LIBNAME)
SHARED_LIBNAME=$(PACKAGE_NAME)
endif
ifndef LIB_FULLNAME
SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)
endif
ifndef SHARED_LIBUNITS
SHARED_LIBUNITS:=$(TARGET_UNITS)
endif
fpc_shared:
ifdef HASSHAREDLIB
$(MAKE) all CREATESHARED=1 LINKSMART=1 CREATESMART=1
$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME)
else
@$(ECHO) Shared Libraries not supported
endif
.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
ifdef INSTALL_UNITS ifdef INSTALL_UNITS
override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS)) override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
@ -2150,7 +2185,7 @@ smart: fpc_smart
release: fpc_release release: fpc_release
units: fpc_units units: fpc_units
examples: examples:
shared: shared: fpc_shared
install: fpc_install install: fpc_install
sourceinstall: fpc_sourceinstall sourceinstall: fpc_sourceinstall
exampleinstall: fpc_exampleinstall exampleinstall: fpc_exampleinstall

View File

@ -11,12 +11,12 @@ libc=y
# clean package units # clean package units
[clean] [clean]
units=$(GGIGRAPH_UNIT) $(GRPAH_UNIT) units=$(GGIGRAPH_UNIT) $(GRAPH_UNIT)
[target] [target]
dirs= dirs=
units= units=
units_linux=$(GRPAH_UNIT) $(GGIGRAPH_UNIT) units_linux=$(GRAPH_UNIT) $(GGIGRAPH_UNIT)
units_freebsd=graph $(GGIGRAPH_UNIT) units_freebsd=graph $(GGIGRAPH_UNIT)
units_win32=graph wincrt winmouse units_win32=graph wincrt winmouse
units_go32v2=graph units_go32v2=graph