1 files changed, 2 insertions, 42 deletions

diff --git a/src/ghdldrv/ghdldrv.adb b/src/ghdldrv/ghdldrv.adb
index bac182572..eda267479 100644
--- a/src/ghdldrv/ghdldrv.adb
+++ b/src/ghdldrv/ghdldrv.adb
@@ -36,7 +36,6 @@ with Options; use Options;
 with Ghdlmain; use Ghdlmain;
 with Ghdllocal; use Ghdllocal;
 with Errorout;
-with Version;
 
 package body Ghdldrv is
    --  Argument table for the tools.
@@ -1834,52 +1833,13 @@ package body Ghdldrv is
       Setup_Libraries (True);
       Files_List := Build_Dependence (Primary_Id, Secondary_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;
 
       -- Omit variables.
       if not Only_Depends then
-         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")
-                  then
-                     Put (" ");
-                     Put (Arg);
-                  end if;
-               end if;
-            end;
-         end loop;
-         New_Line;
+         Ghdllocal.Gen_Makefile_Disp_Variables;
 
          New_Line;