fix_make_files_generation

Gbp-Pq: Name fix_make_files_generation.patch

diff --git a/fpcsrc/Makefile.fpc b/fpcsrc/Makefile.fpc
index 6d464b216b6178de042f9ead3c5f47ad34d1e556..e667ae0409f4c6a4d07377ecdf9229b3c728a872 100644 (file)
--- a/fpcsrc/Makefile.fpc
+++ b/fpcsrc/Makefile.fpc
@@ -7,7 +7,7 @@ name=fpc
 version=3.0.4
 
 [target]
-dirs=compiler rtl utils packages ide installer
+dirs=compiler rtl utils packages ide installer tests
 
 [require]
 nortl=y

diff --git a/fpcsrc/ide/Makefile.fpc b/fpcsrc/ide/Makefile.fpc
index 2be4d0d4ae8f7a8c1923bd85df6b0761acb6c38b..00d727056b738f63f0fe0dfa2e12e1882f2051b1 100644 (file)
--- a/fpcsrc/ide/Makefile.fpc
+++ b/fpcsrc/ide/Makefile.fpc
@@ -1,6 +1,9 @@
 #
 #   Makefile.fpc for running fpmake
 #
+[target]
+dirs=fakegdb compiler
+
 [require]
 packages=rtl fpmkunit
 

diff --git a/fpcsrc/packages/Makefile.fpc b/fpcsrc/packages/Makefile.fpc
index 3174426c8176147b704086dad19a07cadbb7e630..9a9fc3ade1e1b3cfd3dda32d8909587460e3ea25 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/tests/Makefile.fpc b/fpcsrc/tests/Makefile.fpc
index f71771b778356b977608b2f29d272c82bf472a9f..fe4a63d3a1092110705c1de62705e10dc68604ae 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
 
 [rules]

diff --git a/fpcsrc/tests/utils/Makefile.fpc b/fpcsrc/tests/utils/Makefile.fpc
index 89d39c7523269addc97e5f689ae66a37d953e6d4..f559217278f28a6e110c43337a1f3be032ee7ca0 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 a24242b96ff3d27c07e386e066de808ce9bc8003..9ff01088820d2742014678efde161457fc5a42dc 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
+
 [require]
 packages=rtl fpmkunit fcl-json
 

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