diff --git a/utils/fpcres/fpmake.pp b/utils/fpcres/fpmake.pp index 8735f40a86..46e4b01706 100644 --- a/utils/fpcres/fpmake.pp +++ b/utils/fpcres/fpmake.pp @@ -33,17 +33,28 @@ begin P.Dependencies.Add('fcl-res'); T:=P.Targets.AddProgram('fpcres.pas'); + T.Dependencies.AddUnit('closablefilestream'); T.Dependencies.AddUnit('msghandler'); T.Dependencies.AddUnit('paramparser'); T.Dependencies.AddUnit('sourcehandler'); T.Dependencies.AddUnit('target'); + T:=P.Targets.AddProgram('fpcjres'); + + T.Dependencies.AddUnit('closablefilestream'); + T.Dependencies.AddUnit('msghandler'); + T.Dependencies.AddUnit('paramparser'); + T.Dependencies.AddUnit('sourcehandler'); + T.Dependencies.AddUnit('target'); + T.Dependencies.AddUnit('jarsourcehandler'); + P.Targets.AddUnit('closablefilestream.pas').install:=false; P.Targets.AddUnit('msghandler.pas').install:=false; P.Targets.AddUnit('paramparser.pas').install:=false; P.Targets.AddUnit('sourcehandler.pas').install:=false; P.Targets.AddUnit('target.pas').install:=false; + P.Targets.AddUnit('jarsourcehandler.pas').install:=false; end; end; diff --git a/utils/pas2jni/fpmake.pp b/utils/pas2jni/fpmake.pp index 6b5d144a2b..06bf2716ed 100644 --- a/utils/pas2jni/fpmake.pp +++ b/utils/pas2jni/fpmake.pp @@ -28,6 +28,7 @@ begin {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Dependencies.Add('fcl-base'); + P.Dependencies.Add('fcl-process'); P.Dependencies.Add('fcl-json'); T:=P.Targets.AddImplicitUnit('def.pas'); @@ -37,7 +38,6 @@ begin T:=P.Targets.AddImplicitUnit('writer.pas'); T.Install := false; T:=P.Targets.AddProgram('pas2jni.pas'); - T.Install := false; end; end; diff --git a/utils/tply/fpmake.pp b/utils/tply/fpmake.pp index 4b6b82dc59..dbc1999aea 100644 --- a/utils/tply/fpmake.pp +++ b/utils/tply/fpmake.pp @@ -15,7 +15,7 @@ Var begin With Installer do begin - P:=AddPackage('tply'); + P:=AddPackage('lexyacc'); P.Author := ''; P.License := 'LGPL with modification'; diff --git a/utils/unicode/fpmake.pp b/utils/unicode/fpmake.pp index 29db2fdfd9..15caf51066 100644 --- a/utils/unicode/fpmake.pp +++ b/utils/unicode/fpmake.pp @@ -22,7 +22,7 @@ begin P.Email := ''; {$ifdef ALLPACKAGES} - P.Directory:='fpcreslipo'; + P.Directory:='unicode'; {$endif ALLPACKAGES} P.Version:='2.7.1'; P.Dependencies.Add('rtl');