|
|
@@ -1,13 +1,5 @@
|
|
|
#
|
|
|
-<<<<<<< .working
|
|
|
-<<<<<<< .working
|
|
|
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/11/08]
|
|
|
-=======
|
|
|
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/01/29]
|
|
|
-=======
|
|
|
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/02/04]
|
|
|
->>>>>>> .merge-right.r2443
|
|
|
->>>>>>> .merge-right.r2376
|
|
|
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/02/06]
|
|
|
#
|
|
|
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-palmos arm-wince powerpc64-linux
|
|
|
@@ -469,6 +461,8 @@ endif
|
|
|
ifeq ($(FULL_TARGET),powerpc64-linux)
|
|
|
override COMPILER_SOURCEDIR+=libart_lgpl libgnome libgnomeui
|
|
|
endif
|
|
|
+override SHARED_BUILD=n
|
|
|
+override SHARED_BUILD=n
|
|
|
ifdef REQUIRE_UNITSDIR
|
|
|
override UNITSDIR+=$(REQUIRE_UNITSDIR)
|
|
|
endif
|
|
|
@@ -652,6 +646,9 @@ endif
|
|
|
ifndef INSTALL_DATADIR
|
|
|
INSTALL_DATADIR=$(INSTALL_BASEDIR)
|
|
|
endif
|
|
|
+ifndef INSTALL_SHAREDDIR
|
|
|
+INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib
|
|
|
+endif
|
|
|
ifdef CROSSCOMPILE
|
|
|
ifndef CROSSBINDIR
|
|
|
CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))
|
|
|
@@ -671,6 +668,11 @@ GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
|
|
|
endif
|
|
|
endif
|
|
|
endif
|
|
|
+ifeq ($(CPU_TARGET),powerpc64)
|
|
|
+ifeq ($(BINUTILSPREFIX),)
|
|
|
+GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
|
|
|
+endif
|
|
|
+endif
|
|
|
endif
|
|
|
ifndef GCCLIBDIR
|
|
|
CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
|
|
|
@@ -698,6 +700,7 @@ ASMEXT=.s
|
|
|
SMARTEXT=.sl
|
|
|
STATICLIBEXT=.a
|
|
|
SHAREDLIBEXT=.so
|
|
|
+SHAREDLIBPREFIX=libfp
|
|
|
STATICLIBPREFIX=libp
|
|
|
RSTEXT=.rst
|
|
|
ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
|
|
|
@@ -1727,6 +1730,14 @@ ifeq ($(FPC_VERSION),1.0.6)
|
|
|
override FPCOPTDEF+=HASUNIX
|
|
|
endif
|
|
|
endif
|
|
|
+ifdef CREATESHARED
|
|
|
+override FPCOPT+=-Cg
|
|
|
+ifeq ($(CPU_TARGET),i386)
|
|
|
+override FPCOPT+=-Aas
|
|
|
+endif
|
|
|
+endif
|
|
|
+ifdef LINKSHARED
|
|
|
+endif
|
|
|
ifdef GCCLIBDIR
|
|
|
override FPCOPT+=-Fl$(GCCLIBDIR)
|
|
|
endif
|
|
|
@@ -1747,6 +1758,14 @@ override FPCEXTCMD:=$(FPCOPT)
|
|
|
override FPCOPT:=!FPCEXTCMD
|
|
|
export FPCEXTCMD
|
|
|
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)
|
|
|
ifeq (,$(findstring -s ,$(COMPILER)))
|
|
|
EXECPPAS=
|
|
|
@@ -1768,7 +1787,7 @@ ifdef TARGET_RSTS
|
|
|
override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
|
|
|
override CLEANRSTFILES+=$(RSTFILES)
|
|
|
endif
|
|
|
-.PHONY: fpc_all fpc_smart fpc_debug fpc_release
|
|
|
+.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared
|
|
|
$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
|
|
|
@$(ECHOREDIR) Compiled > $(FPCMADE)
|
|
|
fpc_all: $(FPCMADE)
|
|
|
@@ -1809,6 +1828,38 @@ vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
|
|
|
vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
|
|
|
vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
|
|
|
vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
|
|
|
+.PHONY: fpc_shared
|
|
|
+override INSTALLTARGET+=fpc_shared_install
|
|
|
+ifndef SHARED_LIBVERSION
|
|
|
+SHARED_LIBVERSION=$(FPC_VERSION)
|
|
|
+endif
|
|
|
+ifndef SHARED_LIBNAME
|
|
|
+SHARED_LIBNAME=$(PACKAGE_NAME)
|
|
|
+endif
|
|
|
+ifndef SHARED_FULLNAME
|
|
|
+SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT)
|
|
|
+endif
|
|
|
+ifndef SHARED_LIBUNITS
|
|
|
+SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)
|
|
|
+override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
|
|
|
+endif
|
|
|
+fpc_shared:
|
|
|
+ifdef HASSHAREDLIB
|
|
|
+ $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1
|
|
|
+ifneq ($(SHARED_BUILD),n)
|
|
|
+ $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
|
|
|
+endif
|
|
|
+else
|
|
|
+ @$(ECHO) Shared Libraries not supported
|
|
|
+endif
|
|
|
+fpc_shared_install:
|
|
|
+ifneq ($(SHARED_BUILD),n)
|
|
|
+ifneq ($(SHARED_LIBUNITS),)
|
|
|
+ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)
|
|
|
+ $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
|
|
|
+endif
|
|
|
+endif
|
|
|
+endif
|
|
|
.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
|
|
|
ifdef INSTALL_UNITS
|
|
|
override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
|
|
|
@@ -2140,7 +2191,7 @@ smart: fpc_smart
|
|
|
release: fpc_release
|
|
|
units: fpc_units
|
|
|
examples:
|
|
|
-shared:
|
|
|
+shared: fpc_shared
|
|
|
install: fpc_install
|
|
|
sourceinstall: fpc_sourceinstall
|
|
|
exampleinstall: fpc_exampleinstall
|
peter