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

* zlib package correct, you can't use a variable for a package name

Browse Source
This commit is contained in:
peter 1999-12-09 23:20:16 +00:00
parent dcaad61969
commit 076d3b2160
6 changed files with 49 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fcl/go32v2/Makefile
View File

@ -1,5 +1,5 @@
#
# Makefile generated by fpcmake v0.99.13 on 1999-12-06 18:33
# Makefile generated by fpcmake v0.99.13 on 1999-12-10 00:03
#
defaultrule: all
@ -154,7 +154,7 @@ include $(XML)/Makefile.inc
# Targets
override UNITOBJECTS+=classes $(INCUNITS) $(XMLUNITS)
override UNITOBJECTS+=classes $(INCUNITS) $(XMLUNITS) zstream
# Clean
@ -186,6 +186,8 @@ endif
# Packages
override PACKAGES+=paszlib
override NEEDUNITDIR+=$(addprefix $(PACKAGEDIR)/,$(PACKAGES))
# Libraries
@ -313,6 +315,10 @@ ifdef UNITSDIR
override FPCOPT+=-Fu$(UNITSDIR)
endif
ifdef NEEDUNITDIR
override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR))
endif
ifdef NEEDINCDIR
override FPCOPT+=$(addprefix -Fi,$(NEEDINCDIR))
endif
@ -694,7 +700,18 @@ rtl_package:
endif
endif
.PHONY: rtl_package
PACKAGEPASZLIB=1
ifdef PACKAGEPASZLIB
ifneq ($(wildcard $(PACKAGEDIR)/paszlib),)
ifeq ($(wildcard $(PACKAGEDIR)/paszlib/$(FPCMAKED)),)
override COMPILEPACKAGES+=paszlib
paszlib_package:
$(MAKE) -C $(PACKAGEDIR)/paszlib all
endif
endif
endif
.PHONY: rtl_package paszlib_package
#####################################################################
# Units

5
fcl/go32v2/Makefile.fpc
View File

@ -7,6 +7,9 @@ defaulttarget=go32v2
defaultcpu=i386
defaultoptions=-S2
[packages]
packages=paszlib
[dirs]
fpcdir=../..
targetdir=.
@ -14,7 +17,7 @@ incdir=$(INC)
sourcesdir=$(INC) $(XML)
[targets]
units=classes $(INCUNITS) $(XMLUNITS)
units=classes $(INCUNITS) $(XMLUNITS) zstream
[presettings]

29
fcl/linux/Makefile
View File

@ -1,5 +1,5 @@
#
# Makefile generated by fpcmake v0.99.13 on 1999-12-06 18:33
# Makefile generated by fpcmake v0.99.13 on 1999-12-10 00:01
#
defaultrule: all
@ -152,15 +152,6 @@ XML=../xml
include $(INC)/Makefile.inc
include $(XML)/Makefile.inc
# Which package to use
ifndef ZLIBPACKAGE
ifdef inlinux
ZLIBPACKAGE=zlib
else
ZLIBPACKAGE=paszlib
endif
endif
# Targets
override UNITOBJECTS+=classes $(INCUNITS) $(XMLUNITS) zstream
@ -195,7 +186,7 @@ endif
# Packages
override PACKAGES+=$(ZLIBPACKAGE)
override PACKAGES+=zlib
override NEEDUNITDIR+=$(addprefix $(PACKAGEDIR)/,$(PACKAGES))
# Libraries
@ -709,18 +700,18 @@ rtl_package:
endif
endif
PACKAGE$(ZLIBPACKAGE)=1
ifdef PACKAGE$(ZLIBPACKAGE)
ifneq ($(wildcard $(PACKAGEDIR)/$(ZLIBPACKAGE)),)
ifeq ($(wildcard $(PACKAGEDIR)/$(ZLIBPACKAGE)/$(FPCMAKED)),)
override COMPILEPACKAGES+=$(ZLIBPACKAGE)
$(ZLIBPACKAGE)_package:
$(MAKE) -C $(PACKAGEDIR)/$(ZLIBPACKAGE) all
PACKAGEZLIB=1
ifdef PACKAGEZLIB
ifneq ($(wildcard $(PACKAGEDIR)/zlib),)
ifeq ($(wildcard $(PACKAGEDIR)/zlib/$(FPCMAKED)),)
override COMPILEPACKAGES+=zlib
zlib_package:
$(MAKE) -C $(PACKAGEDIR)/zlib all
endif
endif
endif
.PHONY: rtl_package $(ZLIBPACKAGE)_package
.PHONY: rtl_package zlib_package
#####################################################################
# Units

12
fcl/linux/Makefile.fpc
View File

@ -1,5 +1,5 @@
#
# Makefile.fpc for Free Component Library for Win32
# Makefile.fpc for Free Component Library for Linux
#
[defaults]
@ -8,7 +8,7 @@ defaultcpu=i386
defaultoptions=-S2
[packages]
packages=$(ZLIBPACKAGE)
packages=zlib
[dirs]
fpcdir=../..
@ -29,14 +29,6 @@ XML=../xml
include $(INC)/Makefile.inc
include $(XML)/Makefile.inc
# Which package to use
ifndef ZLIBPACKAGE
ifdef inlinux
ZLIBPACKAGE=zlib
else
ZLIBPACKAGE=paszlib
endif
endif
[rules]
INCFILES=$(addprefix $(INC)/,$(INCNAMES))

29
fcl/win32/Makefile
View File

@ -1,5 +1,5 @@
#
# Makefile generated by fpcmake v0.99.13 on 1999-12-06 18:33
# Makefile generated by fpcmake v0.99.13 on 1999-12-10 00:03
#
defaultrule: all
@ -151,15 +151,6 @@ XML=../xml
include $(INC)/Makefile.inc
include $(XML)/Makefile.inc
# Which package to use
ifndef ZLIBPACKAGE
ifdef inlinux
ZLIBPACKAGE=zlib
else
ZLIBPACKAGE=paszlib
endif
endif
# Targets
override UNITOBJECTS+=classes $(INCUNITS) $(XMLUNITS) zstream
@ -194,7 +185,7 @@ endif
# Packages
override PACKAGES+=$(ZLIBPACKAGE)
override PACKAGES+=paszlib
override NEEDUNITDIR+=$(addprefix $(PACKAGEDIR)/,$(PACKAGES))
# Libraries
@ -708,18 +699,18 @@ rtl_package:
endif
endif
PACKAGE$(ZLIBPACKAGE)=1
ifdef PACKAGE$(ZLIBPACKAGE)
ifneq ($(wildcard $(PACKAGEDIR)/$(ZLIBPACKAGE)),)
ifeq ($(wildcard $(PACKAGEDIR)/$(ZLIBPACKAGE)/$(FPCMAKED)),)
override COMPILEPACKAGES+=$(ZLIBPACKAGE)
$(ZLIBPACKAGE)_package:
$(MAKE) -C $(PACKAGEDIR)/$(ZLIBPACKAGE) all
PACKAGEPASZLIB=1
ifdef PACKAGEPASZLIB
ifneq ($(wildcard $(PACKAGEDIR)/paszlib),)
ifeq ($(wildcard $(PACKAGEDIR)/paszlib/$(FPCMAKED)),)
override COMPILEPACKAGES+=paszlib
paszlib_package:
$(MAKE) -C $(PACKAGEDIR)/paszlib all
endif
endif
endif
.PHONY: rtl_package $(ZLIBPACKAGE)_package
.PHONY: rtl_package paszlib_package
#####################################################################
# Units

14
fcl/win32/Makefile.fpc
View File

@ -8,7 +8,7 @@ defaultcpu=i386
defaultoptions=-S2
[packages]
packages=$(ZLIBPACKAGE)
packages=paszlib
[dirs]
fpcdir=../..
@ -19,6 +19,7 @@ sourcesdir=$(INC) $(XML)
[targets]
units=classes $(INCUNITS) $(XMLUNITS) zstream
[presettings]
# Include files
INC=../inc
@ -29,15 +30,6 @@ XML=../xml
include $(INC)/Makefile.inc
include $(XML)/Makefile.inc
# Which package to use
ifndef ZLIBPACKAGE
ifdef inlinux
ZLIBPACKAGE=zlib
else
ZLIBPACKAGE=paszlib
endif
endif
[rules]
INCFILES=$(addprefix $(INC)/,$(INCNAMES))
@ -45,4 +37,4 @@ classes$(PPUEXT): $(INCFILES) classes$(PASEXT)
inifiles$(PPUEXT): classes$(PPUEXT) $(INC)/inifiles$(PASEXT)
ezcgi$(PPUEXT): $(INC)/ezcgi$(PASEXT)
ezcgi$(PPUEXT): $(INC)/ezcgi$(PASEXT)