paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 16:49:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Small fix for classes.pp

Browse Source
This commit is contained in:
michael 2005-02-07 21:05:58 +00:00
parent 2737e8d599
commit 1e3ac92d39
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docs/Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/07] # Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/12]
# #
default: help default: help
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc 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-sunos x86_64-linux x86_64-freebsd arm-linux MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc 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-sunos x86_64-linux x86_64-freebsd arm-linux
@ -1102,16 +1102,12 @@ override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPP
endif endif
ifdef INSTALLPPUFILES ifdef INSTALLPPUFILES
override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
ifneq ($(UNITTARGETDIRPREFIX),) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
endif
override INSTALL_CREATEPACKAGEFPC=1 override INSTALL_CREATEPACKAGEFPC=1
endif endif
ifdef INSTALLEXEFILES ifdef INSTALLEXEFILES
ifneq ($(TARGETDIRPREFIX),) override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(INSTALLEXEFILES)))
endif
endif endif
fpc_install: all $(INSTALLTARGET) fpc_install: all $(INSTALLTARGET)
ifdef INSTALLEXEFILES ifdef INSTALLEXEFILES
@ -1125,7 +1121,7 @@ ifdef INSTALL_CREATEPACKAGEFPC
ifdef FPCMAKE ifdef FPCMAKE
ifdef PACKAGE_VERSION ifdef PACKAGE_VERSION
ifneq ($(wildcard Makefile.fpc),) ifneq ($(wildcard Makefile.fpc),)
$(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc $(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc
$(MKDIR) $(INSTALL_UNITDIR) $(MKDIR) $(INSTALL_UNITDIR)
$(INSTALL) Package.fpc $(INSTALL_UNITDIR) $(INSTALL) Package.fpc $(INSTALL_UNITDIR)
endif endif
@ -1581,11 +1577,8 @@ endif
ifeq ($(findstring darwin,$(OS_SOURCE)),) ifeq ($(findstring darwin,$(OS_SOURCE)),)
override SYSTEMUNITDIR=bsd override SYSTEMUNITDIR=bsd
endif endif
ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin netbsd openbsd),) HOSTOS=$(OS_SOURCE)
CLASSESUNITDIR=unix
else
CLASSESUNITDIR=$(OS_SOURCE) CLASSESUNITDIR=$(OS_SOURCE)
endif
FCLOPTS=--package=fcl --descr=classes.xml --input='$(FPCSRCDIR)/rtl/$(OS_SOURCE)/classes.pp -Fi$(FPCSRCDIR)/rtl/objpas/classes' FCLOPTS=--package=fcl --descr=classes.xml --input='$(FPCSRCDIR)/rtl/$(OS_SOURCE)/classes.pp -Fi$(FPCSRCDIR)/rtl/objpas/classes'
fcl.inc: classes.xml fcl.inc: classes.xml
$(FPDOC) --output=fcl.inc $(FCLOPTS) --format=latex $(FPDOC) --output=fcl.inc $(FCLOPTS) --format=latex

14
docs/Makefile.fpc
View File

@ -255,13 +255,14 @@ endif
ifeq ($(findstring darwin,$(OS_SOURCE)),) ifeq ($(findstring darwin,$(OS_SOURCE)),)
override SYSTEMUNITDIR=bsd override SYSTEMUNITDIR=bsd
endif endif
HOSTOS=$(OS_SOURCE)
# Classes.pp is in rtl/unix/ for several targets # Classes.pp is in rtl/unix/ for several targets
ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin netbsd openbsd),) #ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin netbsd openbsd),)
CLASSESUNITDIR=unix #CLASSESUNITDIR=unix
else #else
CLASSESUNITDIR=$(OS_SOURCE) CLASSESUNITDIR=$(OS_SOURCE)
endif #endif
FCLOPTS=--package=fcl --descr=classes.xml --input='$(FPCSRCDIR)/rtl/$(OS_SOURCE)/classes.pp -Fi$(FPCSRCDIR)/rtl/objpas/classes' FCLOPTS=--package=fcl --descr=classes.xml --input='$(FPCSRCDIR)/rtl/$(OS_SOURCE)/classes.pp -Fi$(FPCSRCDIR)/rtl/objpas/classes'
@ -565,7 +566,10 @@ execute:
# #
# $Log$ # $Log$
# Revision 1.4 2005-02-07 20:39:19 peter # Revision 1.5 2005-02-07 21:05:58 michael
# + Small fix for classes.pp
#
# Revision 1.4 2005/02/07 20:39:19 peter
# fix zip names # fix zip names
# #
# Revision 1.3 2005/02/06 21:02:12 peter # Revision 1.3 2005/02/06 21:02:12 peter