paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-30 09:39:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

* don't create shared libs for graph

Browse Source 
git-svn-id: trunk@2262 -
This commit is contained in:
florian 2006-01-11 22:50:24 +00:00
parent 3eda59948d
commit cfe47bf0d8
2 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/base/graph/Makefile
View File

@ -921,9 +921,6 @@ endif
ifndef INSTALL_DATADIR ifndef INSTALL_DATADIR
INSTALL_DATADIR=$(INSTALL_BASEDIR) INSTALL_DATADIR=$(INSTALL_BASEDIR)
endif endif
ifndef INSTALL_SHAREDDIR
INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib
endif
ifdef CROSSCOMPILE ifdef CROSSCOMPILE
ifndef CROSSBINDIR ifndef CROSSBINDIR
CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX)) CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))
@ -1752,8 +1749,6 @@ ifeq ($(CPU_TARGET),i386)
override FPCOPT+=-Aas override FPCOPT+=-Aas
endif endif
endif endif
ifdef LINKSHARED
endif
ifdef GCCLIBDIR ifdef GCCLIBDIR
override FPCOPT+=-Fl$(GCCLIBDIR) override FPCOPT+=-Fl$(GCCLIBDIR)
endif endif
@ -1803,7 +1798,7 @@ ifdef TARGET_RSTS
override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
override CLEANRSTFILES+=$(RSTFILES) override CLEANRSTFILES+=$(RSTFILES)
endif endif
.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared .PHONY: fpc_all fpc_smart fpc_debug fpc_release
$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET) $(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
@$(ECHOREDIR) Compiled > $(FPCMADE) @$(ECHOREDIR) Compiled > $(FPCMADE)
fpc_all: $(FPCMADE) fpc_all: $(FPCMADE)
@ -1845,35 +1840,25 @@ 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 .PHONY: fpc_shared
override INSTALLTARGET+=fpc_shared_install
ifndef SHARED_LIBVERSION ifndef SHARED_LIBVERSION
SHARED_LIBVERSION=$(FPC_VERSION) SHARED_LIBVERSION=$(FPC_VERSION)
endif endif
ifndef SHARED_LIBNAME ifndef $(SHARED_LIBNAME)
SHARED_LIBNAME=$(PACKAGE_NAME) SHARED_LIBNAME=$(PACKAGE_NAME)
endif endif
ifndef SHARED_FULLNAME ifndef LIB_FULLNAME
SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT) SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)
endif endif
ifndef SHARED_LIBUNITS ifndef SHARED_LIBUNITS
SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS) SHARED_LIBUNITS:=$(TARGET_UNITS)
override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS))
endif endif
fpc_shared: fpc_shared:
ifdef HASSHAREDLIB ifdef HASSHAREDLIB
$(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1 $(MAKE) all CREATESHARED=1 LINKSMART=1 CREATESMART=1
ifneq ($(SHARED_BUILD),n) $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME)
$(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)
endif
else else
@$(ECHO) Shared Libraries not supported @$(ECHO) Shared Libraries not supported
endif endif
fpc_shared_install:
ifneq ($(SHARED_BUILD),n)
ifneq ($(SHARED_LIBUNITS),)
$(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR)
endif
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))

6
packages/base/graph/Makefile.fpc
View File

@ -32,15 +32,15 @@ includedir_netbsd=unix
includedir_openbsd=unix includedir_openbsd=unix
sourcedir=$(OS_TARGET) inc sourcedir=$(OS_TARGET) inc
[libs]
libname=fpgraph
[install] [install]
fpcpackage=y fpcpackage=y
[default] [default]
fpcdir=../../.. fpcdir=../../..
[shared]
build=n
[prerules] [prerules]
GRAPHDIR=inc GRAPHDIR=inc
UNIXINC=unix UNIXINC=unix