paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-12 10:33:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

+ Now a make works completely

Browse Source
This commit is contained in:
michael 1999-12-01 09:42:26 +00:00
parent ae375101a2
commit a0882cbedb
2 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
fcl/win32/Makefile
View File

@ -1,5 +1,5 @@
# #
# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:49 # Makefile generated by fpcmake v0.99.13 on 1999/12/01 10:27
# #
defaultrule: all defaultrule: all
@ -63,7 +63,6 @@ endif
# Default target # Default target
##################################################################### #####################################################################
override OS_TARGET:=win32
override CPU_TARGET:=i386 override CPU_TARGET:=i386
##################################################################### #####################################################################
@ -147,9 +146,18 @@ XML=../xml
include $(INC)/Makefile.inc include $(INC)/Makefile.inc
include $(XML)/Makefile.inc include $(XML)/Makefile.inc
# Which package to use
ifndef ZLIBPACKAGE
ifdef inlinux
ZLIBPACKAGE=zlib
else
ZLIBPACKAGE=paszlib
endif
endif
# Targets # Targets
override UNITOBJECTS+=classes $(INCUNITS) $(XMLUNITS) zlib zstream override UNITOBJECTS+=classes $(INCUNITS) $(XMLUNITS) zstream
# Clean # Clean
@ -181,6 +189,8 @@ endif
# Packages # Packages
override PACKAGES+=$(ZLIBPACKAGE)
override NEEDUNITDIR+=$(addprefix $(PACKAGEDIR)/,$(PACKAGES))
# Libraries # Libraries
@ -307,6 +317,10 @@ ifdef UNITSDIR
override FPCOPT+=-Fu$(UNITSDIR) override FPCOPT+=-Fu$(UNITSDIR)
endif endif
ifdef NEEDUNITDIR
override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR))
endif
ifdef NEEDINCDIR ifdef NEEDINCDIR
override FPCOPT+=$(addprefix -Fi,$(NEEDINCDIR)) override FPCOPT+=$(addprefix -Fi,$(NEEDINCDIR))
endif endif
@ -680,7 +694,18 @@ rtl_package:
endif endif
endif endif
.PHONY: rtl_package 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
endif
endif
endif
.PHONY: rtl_package $(ZLIBPACKAGE)_package
##################################################################### #####################################################################
# Units # Units
@ -995,6 +1020,6 @@ INCFILES=$(addprefix $(INC)/,$(INCNAMES))
classes$(PPUEXT): $(INCFILES) classes$(PASEXT) classes$(PPUEXT): $(INCFILES) classes$(PASEXT)
inifiles$(PPUEXT): classes$(PPUEXT) inifiles$(PASEXT) inifiles$(PPUEXT): classes$(PPUEXT) $(INC)/inifiles$(PASEXT)
ezcgi$(PPUEXT): ezcgi$(PASEXT) ezcgi.inc ezcgi$(PPUEXT): $(INC)/ezcgi$(PASEXT)

21
fcl/win32/Makefile.fpc
View File

@ -3,10 +3,13 @@
# #
[defaults] [defaults]
defaulttarget=win32 jdefaulttarget=win32
defaultcpu=i386 defaultcpu=i386
defaultoptions=-S2 defaultoptions=-S2
[packages]
packages=$(ZLIBPACKAGE)
[dirs] [dirs]
fpcdir=../.. fpcdir=../..
targetdir=. targetdir=.
@ -14,8 +17,7 @@ incdir=$(INC)
sourcesdir=$(INC) $(XML) sourcesdir=$(INC) $(XML)
[targets] [targets]
units=classes $(INCUNITS) $(XMLUNITS) zlib zstream units=classes $(INCUNITS) $(XMLUNITS) zstream
[presettings] [presettings]
# Include files # Include files
@ -27,13 +29,20 @@ XML=../xml
include $(INC)/Makefile.inc include $(INC)/Makefile.inc
include $(XML)/Makefile.inc include $(XML)/Makefile.inc
# Which package to use
ifndef ZLIBPACKAGE
ifdef inlinux
ZLIBPACKAGE=zlib
else
ZLIBPACKAGE=paszlib
endif
endif
[rules] [rules]
INCFILES=$(addprefix $(INC)/,$(INCNAMES)) INCFILES=$(addprefix $(INC)/,$(INCNAMES))
classes$(PPUEXT): $(INCFILES) classes$(PASEXT) classes$(PPUEXT): $(INCFILES) classes$(PASEXT)
inifiles$(PPUEXT): classes$(PPUEXT) inifiles$(PASEXT) inifiles$(PPUEXT): classes$(PPUEXT) $(INC)/inifiles$(PASEXT)
ezcgi$(PPUEXT): ezcgi$(PASEXT) ezcgi.inc
ezcgi$(PPUEXT): $(INC)/ezcgi$(PASEXT)