--- Merging r32074 into '.':

U    packages/rtl-objpas/fpmake.pp
--- Recording mergeinfo for merge of r32074 into '.':
 U   .
--- Merging r32119 into '.':
U    packages/aspell/fpmake.pp
--- Recording mergeinfo for merge of r32119 into '.':
 G   .
--- Merging r32120 into '.':
U    packages/rtl-extra/fpmake.pp
--- Recording mergeinfo for merge of r32120 into '.':
 G   .
--- Merging r32121 into '.':
U    packages/chm/fpmake.pp
--- Recording mergeinfo for merge of r32121 into '.':
 G   .
--- Merging r32123 into '.':
U    packages/fcl-db/fpmake.pp
--- Recording mergeinfo for merge of r32123 into '.':
 G   .

# revisions: 32074,32119,32120,32121,32123

git-svn-id: branches/fixes_3_0@32239 -

packages/aspell/fpmake.pp

@@ -31,6 +31,7 @@ begin
     P.SourcePath.Add('src');
 
     T:=P.Targets.AddUnit('aspell.pp');
+    T.Dependencies.AddInclude('src/aspelltypes.inc');
     T:=P.Targets.AddUnit('aspelldyn.pp');
     T:=P.Targets.AddUnit('spellcheck.pp');
     with T.Dependencies do

packages/chm/fpmake.pp

@@ -32,6 +32,7 @@ begin
     D.Version:='3.0.1';
 
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
 
     T:=P.Targets.AddUnit('chmbase.pas');
     T:=P.Targets.AddUnit('chmfilewriter.pas');
@@ -75,6 +76,7 @@ begin
           AddUnit('chmspecialfiles');
           AddUnit('paslzxcomp');
           AddUnit('chmfiftimain');
+          AddInclude('chmobjinstconst.inc');
         end;
     T:=P.Targets.AddUnit('lzxcompressthread.pas');
       with T.Dependencies do

packages/fcl-db/fpmake.pp

@@ -96,6 +96,7 @@ begin
       with T.Dependencies do
         begin
         AddUnit('db');
+        AddUnit('sqldb');
         AddUnit('bufdataset');
         end;
 
@@ -721,6 +722,7 @@ begin
           AddUnit('db');
           AddUnit('bufdataset');
           AddUnit('dbconst');
+          AddUnit('sqlscript');
         end;
     T:=P.Targets.AddUnit('sqldblib.pp');
       with T.Dependencies do

packages/rtl-extra/fpmake.pp

@@ -83,6 +83,8 @@ begin
     T:=P.Targets.AddUnit('objects.pp',ObjectsOSes);
 
     T:=P.Targets.AddUnit('printer.pp',PrinterOSes);
+    T.Dependencies.AddInclude('printerh.inc',PrinterOSes);
+    T.Dependencies.AddInclude('printer.inc',PrinterOSes);
 
     T:=P.Targets.AddUnit('matrix.pp',MatrixOSes);
     with T.Dependencies do
@@ -105,6 +107,7 @@ begin
     T:=P.Targets.AddUnit('sockets.pp',SocketsOSes);
     with T.Dependencies do
      begin
+       addinclude('osdefs.inc',AllUnixOSes);
        addinclude('socketsh.inc');
        addinclude('sockets.inc');
        addinclude('sockovl.inc');
@@ -116,6 +119,7 @@ begin
     T:=P.Targets.AddUnit('ipc.pp',IPCOSes);
     with T.Dependencies do
      begin
+       addinclude('osdefs.inc');
        addinclude('ipcbsd.inc',IPCBSDs);
        addinclude('ipcsys.inc',[Linux]);
        addinclude('ipccall.inc',[Linux]);

packages/rtl-objpas/fpmake.pp

@@ -65,6 +65,7 @@ begin
     with T.Dependencies do
       begin
         AddInclude('varutilh.inc');
+        AddInclude('varerror.inc');
         AddInclude('varutils.inc',VarUtilsOSes-[win32,win64]);
         AddInclude('cvarutil.inc');
       end;