* classes in unix dir

This commit is contained in:
peter 2005-02-11 16:25:37 +00:00
parent d4be793575
commit 9e8dd7fd9e
2 changed files with 22 additions and 13 deletions

View File

@ -1,10 +1,10 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/12] # Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
# #
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-solaris 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-solaris x86_64-linux x86_64-freebsd arm-linux
BSDs = freebsd netbsd openbsd darwin BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) sunos qnx UNIXs = linux $(BSDs) solaris qnx
LIMIT83fs = go32v2 os2 emx watcom LIMIT83fs = go32v2 os2 emx watcom
FORCE: FORCE:
.PHONY: FORCE .PHONY: FORCE
@ -516,7 +516,7 @@ BATCHEXT=.sh
EXEEXT= EXEEXT=
SHORTSUFFIX=be SHORTSUFFIX=be
endif endif
ifeq ($(OS_TARGET),sunos) ifeq ($(OS_TARGET),solaris)
BATCHEXT=.sh BATCHEXT=.sh
EXEEXT= EXEEXT=
SHORTSUFFIX=sun SHORTSUFFIX=sun
@ -642,7 +642,7 @@ STATICLIBEXT=.a
EXEEXT= EXEEXT=
SHORTSUFFIX=be SHORTSUFFIX=be
endif endif
ifeq ($(OS_TARGET),sunos) ifeq ($(OS_TARGET),solaris)
BATCHEXT=.sh BATCHEXT=.sh
PPUEXT=.ppu PPUEXT=.ppu
ASMEXT=.s ASMEXT=.s
@ -1102,12 +1102,16 @@ 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)))
override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES)) ifneq ($(UNITTARGETDIRPREFIX),)
override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES))) override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
endif
override INSTALL_CREATEPACKAGEFPC=1 override INSTALL_CREATEPACKAGEFPC=1
endif endif
ifdef INSTALLEXEFILES ifdef INSTALLEXEFILES
override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES)) ifneq ($(TARGETDIRPREFIX),)
override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(INSTALLEXEFILES)))
endif
endif endif
fpc_install: all $(INSTALLTARGET) fpc_install: all $(INSTALLTARGET)
ifdef INSTALLEXEFILES ifdef INSTALLEXEFILES
@ -1121,7 +1125,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$(OS_TARGET) Makefile.fpc $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc
$(MKDIR) $(INSTALL_UNITDIR) $(MKDIR) $(INSTALL_UNITDIR)
$(INSTALL) Package.fpc $(INSTALL_UNITDIR) $(INSTALL) Package.fpc $(INSTALL_UNITDIR)
endif endif
@ -1578,6 +1582,8 @@ ifeq ($(findstring darwin,$(OS_SOURCE)),)
override SYSTEMUNITDIR=bsd override SYSTEMUNITDIR=bsd
endif endif
HOSTOS=$(OS_SOURCE) HOSTOS=$(OS_SOURCE)
ifneq ($(findstring $(OS_SOURCE),linux freebsd darwin netbsd openbsd),)
CLASSESUNITDIR=unix
CLASSESUNITDIR=$(OS_SOURCE) CLASSESUNITDIR=$(OS_SOURCE)
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

View File

@ -258,8 +258,8 @@ endif
HOSTOS=$(OS_SOURCE) 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
@ -566,7 +566,10 @@ execute:
# #
# $Log$ # $Log$
# Revision 1.5 2005-02-07 21:05:58 michael # Revision 1.6 2005-02-11 16:25:37 peter
# * classes in unix dir
#
# Revision 1.5 2005/02/07 21:05:58 michael
# + Small fix for classes.pp # + Small fix for classes.pp
# #
# Revision 1.4 2005/02/07 20:39:19 peter # Revision 1.4 2005/02/07 20:39:19 peter