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

Explictly add subdirectory fpmake.pp sources to ./fpmake dependencies

Browse Source 
git-svn-id: trunk@29155 -
This commit is contained in:
pierre 2014-11-26 15:23:50 +00:00
parent 8ea4e575f2
commit 49a5dcbf53
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/Makefile
View File

@ -351,6 +351,7 @@ endif
ifdef UNITDIR_FPMAKE_FPMKUNIT
override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)
endif
SUB_FPMAKE_SRCS=$(wildcard */fpmake.pp)
override INSTALL_FPCPACKAGE=y
override INSTALL_FPCSUBDIR=packages
ifdef REQUIRE_UNITSDIR
@ -1640,7 +1641,7 @@ endif
.NOTPARALLEL:
fpmkunit_clean_bootstrap:
$(MAKE) -C fpmkunit clean_bootstrap
fpmake$(SRCEXEEXT): fpmake.pp
fpmake$(SRCEXEEXT): fpmake.pp $(SUB_FPMAKE_SRCS) fpmake_add.inc fpmake_proc.inc
$(MAKE) -C fpmkunit bootstrap
$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT)
all: fpmake$(SRCEXEEXT)

4
packages/Makefile.fpc
View File

@ -43,6 +43,8 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT
override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)
endif
SUB_FPMAKE_SRCS=$(wildcard */fpmake.pp)
[rules]
# Do not pass the Makefile's unit and binary target locations. fpmake uses it's own.
override FPCOPT:=$(filter-out -FU%,$(FPCOPT))
@ -63,7 +65,7 @@ endif
fpmkunit_clean_bootstrap:
$(MAKE) -C fpmkunit clean_bootstrap
fpmake$(SRCEXEEXT): fpmake.pp
fpmake$(SRCEXEEXT): fpmake.pp $(SUB_FPMAKE_SRCS) fpmake_add.inc fpmake_proc.inc
$(MAKE) -C fpmkunit bootstrap
$(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) $(OPT)
all: fpmake$(SRCEXEEXT)