From 80a66df0c3a4283d98d92c79647c2fe6454e6b7c Mon Sep 17 00:00:00 2001
From: Abou Al Montacir <abou.almontacir@sfr.fr>
Date: Mon, 4 Dec 2017 23:55:22 +0100
Subject: [PATCH] Fix sub directories in Makefile.fpc to allor recursive
 generation.

Gbp-Pq: Name fix_make_files_generation.patch
---
 fpcsrc/Makefile.fpc              | 2 +-
 fpcsrc/packages/Makefile.fpc     | 3 +++
 fpcsrc/packages/ide/Makefile.fpc | 3 +++
 fpcsrc/tests/Makefile.fpc        | 1 +
 fpcsrc/tests/utils/Makefile.fpc  | 1 +
 fpcsrc/utils/Makefile.fpc        | 3 +++
 fpcsrc/utils/fpcm/fpmake.pp      | 2 +-
 7 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/fpcsrc/Makefile.fpc b/fpcsrc/Makefile.fpc
index 6c8411f1..e4c9e412 100644
--- a/fpcsrc/Makefile.fpc
+++ b/fpcsrc/Makefile.fpc
@@ -7,7 +7,7 @@ name=fpc
 version=3.2.2
 
 [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 47a06e59..5042a57b 100644
--- 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 01d7d912..a7e2531f 100644
--- a/fpcsrc/packages/ide/Makefile.fpc
+++ b/fpcsrc/packages/ide/Makefile.fpc
@@ -5,6 +5,9 @@
 name=ide
 version=3.2.2
 
+[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 7bf5b7c3..d8e38a1d 100644
--- 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 b8baf607..ae685dcb 100644
--- 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 7984e7d2..47777923 100644
--- 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 79e10bd1..6724b4db 100644
--- a/fpcsrc/utils/fpcm/fpmake.pp
+++ b/fpcsrc/utils/fpcm/fpmake.pp
@@ -221,7 +221,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='3.2.2';
 
-    P.Dependencies.Add('fcl-base');
+    //P.Dependencies.Add('fcl-base');
 
     T:=P.Targets.AddProgram('fpcmake.pp');
 
-- 
2.30.2