ghdldrv: factorize part of --gen-makefile

Fix #1403

1 files changed, 2 insertions, 45 deletions

diff --git a/src/ghdldrv/ghdlcomp.adb b/src/ghdldrv/ghdlcomp.adb
index c58360aee..96a854d28 100644
--- a/src/ghdldrv/ghdlcomp.adb
+++ b/src/ghdldrv/ghdlcomp.adb
@@ -34,7 +34,6 @@ with Vhdl.Utils;
 with Vhdl.Configuration;
 with Errorout; use Errorout;
 with Libraries;
-with Version;
 
 package body Ghdlcomp is
 
@@ -842,7 +841,6 @@ package body Ghdlcomp is
    is
       pragma Unreferenced (Cmd);
       use Simple_IO;
-      use Ada.Command_Line;
       use Name_Table;
 
       HT : constant Character := ASCII.HT;
@@ -861,52 +859,11 @@ package body Ghdlcomp is
       Setup_Libraries (True);
       Files_List := Build_Dependence (Prim_Id, Sec_Id);
 
-      Put_Line ("# Makefile automatically generated by ghdl");
-      Put ("# Version: GHDL ");
-      Put (Version.Ghdl_Ver);
-      Put (' ');
-      Put (Version.Ghdl_Release);
-      Put (" - ");
-      if Version_String /= null then
-         Put (Version_String.all);
-      end if;
-      New_Line;
-      Put_Line ("# Command used to generate this makefile:");
-      Put ("# ");
-      Put (Command_Name);
-      for I in 1 .. Argument_Count loop
-         Put (' ');
-         Put (Argument (I));
-      end loop;
-      New_Line;
+      Ghdllocal.Gen_Makefile_Disp_Header;
 
       New_Line;
 
-      Put ("GHDL=");
-      Put_Line (Command_Name);
-
-      --  Extract options for command line.
-      Put ("GHDLFLAGS=");
-      for I in 2 .. Argument_Count loop
-         declare
-            Arg : constant String := Argument (I);
-         begin
-            if Arg (1) = '-' then
-               if (Arg'Length > 10 and then Arg (1 .. 10) = "--workdir=")
-                 or else (Arg'Length > 7 and then Arg (1 .. 7) = "--ieee=")
-                 or else (Arg'Length > 6 and then Arg (1 .. 6) = "--std=")
-                 or else (Arg'Length > 7 and then Arg (1 .. 7) = "--work=")
-                 or else (Arg'Length > 2 and then Arg (1 .. 2) = "-P")
-                 or else (Arg'Length > 2 and then Arg (1 .. 2) = "-f")
-                 or else (Arg'Length > 6 and then Arg (1 .. 6) = "--std=")
-               then
-                  Put (" ");
-                  Put (Arg);
-               end if;
-            end if;
-         end;
-      end loop;
-      New_Line;
+      Ghdllocal.Gen_Makefile_Disp_Variables;
 
       Put ("GHDLRUNFLAGS=");
       for I in Next_Arg .. Args'Last loop