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

* added paszlib/zlib deps

Browse Source
This commit is contained in:
peter 2000-01-06 23:35:47 +00:00
parent 44246c2d58
commit cbfc1cd56a
2 changed files with 105 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
utils/Makefile
View File

@ -200,7 +200,19 @@ endif
# Packages # Packages
override PACKAGES+=rtl fcl zlib override PACKAGES+=rtl fcl
ifeq ($(OS_TARGET),linux)
override PACKAGES+=zlib
endif
ifeq ($(OS_TARGET),go32v2)
override PACKAGES+=paszlib
endif
ifeq ($(OS_TARGET),win32)
override PACKAGES+=paszlib
endif
ifeq ($(OS_TARGET),os2)
override PACKAGES+=paszlib
endif
ifneq ($(wildcard $(FPCDIR)/rtl),) ifneq ($(wildcard $(FPCDIR)/rtl),)
ifneq ($(wildcard $(FPCDIR)/rtl/$(OS_TARGET)),) ifneq ($(wildcard $(FPCDIR)/rtl/$(OS_TARGET)),)
PACKAGEDIR_RTL=$(FPCDIR)/rtl/$(OS_TARGET) PACKAGEDIR_RTL=$(FPCDIR)/rtl/$(OS_TARGET)
@ -267,6 +279,72 @@ endif
ifdef UNITDIR_ZLIB ifdef UNITDIR_ZLIB
override NEEDUNITDIR+=$(UNITDIR_ZLIB) override NEEDUNITDIR+=$(UNITDIR_ZLIB)
endif endif
ifneq ($(wildcard $(PACKAGEDIR)/paszlib),)
ifneq ($(wildcard $(PACKAGEDIR)/paszlib/$(OS_TARGET)),)
PACKAGEDIR_PASZLIB=$(PACKAGEDIR)/paszlib/$(OS_TARGET)
else
PACKAGEDIR_PASZLIB=$(PACKAGEDIR)/paszlib
endif
UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
else
PACKAGEDIR_PASZLIB=
ifneq ($(wildcard $(UNITSDIR)/paszlib),)
ifneq ($(wildcard $(UNITSDIR)/paszlib/$(OS_TARGET)),)
UNITDIR_PASZLIB=$(UNITSDIR)/paszlib/$(OS_TARGET)
else
UNITDIR_PASZLIB=$(UNITSDIR)/paszlib
endif
else
UNITDIR_PASZLIB=
endif
endif
ifdef UNITDIR_PASZLIB
override NEEDUNITDIR+=$(UNITDIR_PASZLIB)
endif
ifneq ($(wildcard $(PACKAGEDIR)/paszlib),)
ifneq ($(wildcard $(PACKAGEDIR)/paszlib/$(OS_TARGET)),)
PACKAGEDIR_PASZLIB=$(PACKAGEDIR)/paszlib/$(OS_TARGET)
else
PACKAGEDIR_PASZLIB=$(PACKAGEDIR)/paszlib
endif
UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
else
PACKAGEDIR_PASZLIB=
ifneq ($(wildcard $(UNITSDIR)/paszlib),)
ifneq ($(wildcard $(UNITSDIR)/paszlib/$(OS_TARGET)),)
UNITDIR_PASZLIB=$(UNITSDIR)/paszlib/$(OS_TARGET)
else
UNITDIR_PASZLIB=$(UNITSDIR)/paszlib
endif
else
UNITDIR_PASZLIB=
endif
endif
ifdef UNITDIR_PASZLIB
override NEEDUNITDIR+=$(UNITDIR_PASZLIB)
endif
ifneq ($(wildcard $(PACKAGEDIR)/paszlib),)
ifneq ($(wildcard $(PACKAGEDIR)/paszlib/$(OS_TARGET)),)
PACKAGEDIR_PASZLIB=$(PACKAGEDIR)/paszlib/$(OS_TARGET)
else
PACKAGEDIR_PASZLIB=$(PACKAGEDIR)/paszlib
endif
UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
else
PACKAGEDIR_PASZLIB=
ifneq ($(wildcard $(UNITSDIR)/paszlib),)
ifneq ($(wildcard $(UNITSDIR)/paszlib/$(OS_TARGET)),)
UNITDIR_PASZLIB=$(UNITSDIR)/paszlib/$(OS_TARGET)
else
UNITDIR_PASZLIB=$(UNITSDIR)/paszlib
endif
else
UNITDIR_PASZLIB=
endif
endif
ifdef UNITDIR_PASZLIB
override NEEDUNITDIR+=$(UNITDIR_PASZLIB)
endif
# Libraries # Libraries
@ -794,7 +872,18 @@ endif
PACKAGERTL=1 PACKAGERTL=1
PACKAGEFCL=1 PACKAGEFCL=1
ifeq ($(OS_TARGET),linux)
PACKAGEZLIB=1 PACKAGEZLIB=1
endif
ifeq ($(OS_TARGET),go32v2)
PACKAGEPASZLIB=1
endif
ifeq ($(OS_TARGET),win32)
PACKAGEPASZLIB=1
endif
ifeq ($(OS_TARGET),os2)
PACKAGEPASZLIB=1
endif
ifdef PACKAGERTL ifdef PACKAGERTL
ifneq ($(wildcard $(PACKAGEDIR_RTL)),) ifneq ($(wildcard $(PACKAGEDIR_RTL)),)
ifeq ($(wildcard $(PACKAGEDIR_RTL)/$(FPCMADE)),) ifeq ($(wildcard $(PACKAGEDIR_RTL)/$(FPCMADE)),)
@ -822,8 +911,17 @@ zlib_package:
endif endif
endif endif
endif endif
ifdef PACKAGEPASZLIB
ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)),)
ifeq ($(wildcard $(PACKAGEDIR_PASZLIB)/$(FPCMADE)),)
override COMPILEPACKAGES+=paszlib
paszlib_package:
$(MAKE) -C $(PACKAGEDIR_PASZLIB) all
endif
endif
endif
.PHONY: rtl_package rtl_package fcl_package zlib_package .PHONY: rtl_package rtl_package fcl_package zlib_package paszlib_package
##################################################################### #####################################################################
# Exes # Exes

6
utils/Makefile.fpc
View File

@ -10,7 +10,11 @@ programs=ppufiles ppudump ppumove ppdep ptop rstconv data2inc fpcmake delp bin2o
units=ppu ptopu units=ppu ptopu
[require] [require]
packages=fcl zlib packages=fcl
packages_linux=zlib
packages_os2=paszlib
packages_win32=paszlib
packages_go32v2=paszlib
[tools] [tools]
tooldata2inc=1 tooldata2inc=1