Fix sub directories in Makefile.fpc to allor recursive generation.

Gbp-Pq: Name fix_make_files_generation.patch

diff --git a/fpcsrc/Makefile.fpc b/fpcsrc/Makefile.fpc
index 50a0faf347aff65c6af6a8adbe98c0fd98f8ba5e..b3cfd3d157e86e666a49f6f68e0541b9336e12ee 100644 (file)
--- a/fpcsrc/Makefile.fpc
+++ b/fpcsrc/Makefile.fpc
@@ -7,7 +7,7 @@ name=fpc
 version=3.2.0
 
 [target]
-dirs=compiler rtl utils packages installer
+dirs=compiler rtl utils packages installer tests
 
 [require]
 nortl=y

diff --git a/fpcsrc/packages/Makefile.fpc b/fpcsrc/packages/Makefile.fpc
index 47a06e5939191821110bf09b9c7f97789fa53ce3..5042a57be3de74025b6f5bc721ea15680a2a25fa 100644 (file)
--- a/fpcsrc/packages/Makefile.fpc
+++ b/fpcsrc/packages/Makefile.fpc
@@ -2,6 +2,9 @@
 #
 #   Makefile.fpc for Free Pascal Packages
 #
+[target]
+dirs= paszlib fcl-process hash libtar fpmkunit
+
 [require]
 packages=rtl
 

diff --git a/fpcsrc/packages/ide/Makefile.fpc b/fpcsrc/packages/ide/Makefile.fpc
index 1ed21da7a842bb18a85e41f800da40806ca64e18..9c98e0602f42b8ac346a109188a9ec1f26c3e314 100644 (file)
--- a/fpcsrc/packages/ide/Makefile.fpc
+++ b/fpcsrc/packages/ide/Makefile.fpc
@@ -5,6 +5,9 @@
 name=ide
 version=3.2.0
 
+[target]
+dirs=fakegdb compiler
+
 [require]
 packages=rtl fpmkunit rtl-extra fv chm regexpr
 packages_go32v2=graph

diff --git a/fpcsrc/tests/Makefile.fpc b/fpcsrc/tests/Makefile.fpc
index 7bf5b7c3320fc754a799867d93e4e00370ad4129..d8e38a1d79bfddbfd3520eeea7448c92d3c6bc39 100644 (file)
--- a/fpcsrc/tests/Makefile.fpc
+++ b/fpcsrc/tests/Makefile.fpc
@@ -10,6 +10,7 @@ fpcdir=..
 rule=allexectests
 
 [target]
+dirs=tstunits utils
 programs=gparmake createlst
 
 [rules]

diff --git a/fpcsrc/tests/utils/Makefile.fpc b/fpcsrc/tests/utils/Makefile.fpc
index b8baf60776e1fff824d9087a2115b671ecb9d517..ae685dcb115faa6100d061d1899f54f4bb13c841 100644 (file)
--- a/fpcsrc/tests/utils/Makefile.fpc
+++ b/fpcsrc/tests/utils/Makefile.fpc
@@ -13,6 +13,7 @@ fpcdir=../..
 nortl=y
 
 [target]
+dirs=testsuite
 programs=dotest fptime fail testfail digest concat $(DBDIGEST) $(MSDOSPROG)
 programs_win32=prepup
 programs_win64=prepup

diff --git a/fpcsrc/utils/Makefile.fpc b/fpcsrc/utils/Makefile.fpc
index 7984e7d22d539ca45f58e45cb6475552901f53a7..47777923d1357c6315769aba47a8e4f746f56ac8 100644 (file)
--- a/fpcsrc/utils/Makefile.fpc
+++ b/fpcsrc/utils/Makefile.fpc
@@ -1,6 +1,9 @@
 #
 #   Makefile.fpc for running fpmake
 #
+[target]
+dirs=fpcm debugsvr dxegen fpcmkcfg fpcreslipo fpcres fpdoc fppkg fprcp h2pas importtl instantfpc mksymbian pas2fpm pas2jni pas2js pas2ut rmwait tply unicode json2pas
+
 [require]
 packages=rtl fpmkunit fcl-json
 

diff --git a/fpcsrc/utils/fpcm/fpmake.pp b/fpcsrc/utils/fpcm/fpmake.pp
index dcd9bfad307713143eda12c582b1e482381c6e2f..69e108f903f5ecc785bbd2f1aa5d72f39c73e697 100644 (file)
--- a/fpcsrc/utils/fpcm/fpmake.pp
+++ b/fpcsrc/utils/fpcm/fpmake.pp
@@ -215,7 +215,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='3.2.0';
 
-    P.Dependencies.Add('fcl-base');
+    //P.Dependencies.Add('fcl-base');
 
     T:=P.Targets.AddProgram('fpcmake.pp');