[PATCH 0/1] MR2241: makedep: Better differentiate between compiling and linking commands.

[Bernhard Kölbl]

This makes one able to see what is being built as PE and UNIX code and shows 'LINK' for linking in silent configuration `--enable-silent-rules`.

For example:
```
make: Entering directory '/home/bernhard/Documents/programming/builds/wine/x64'
  UNIX   dlls/windows.media.speech/unixlib.o
  PE     dlls/windows.media.speech/x86_64-windows/async.o
  PE     dlls/windows.media.speech/x86_64-windows/main.o
  PE     dlls/windows.media.speech/x86_64-windows/recognizer.o
  PE     dlls/windows.media.speech/x86_64-windows/event_handlers.o
  PE     dlls/windows.media.speech/x86_64-windows/listconstraint.o
  PE     dlls/windows.media.speech/x86_64-windows/synthesizer.o
  PE     dlls/windows.media.speech/x86_64-windows/vector.o
  WIDL   dlls/windows.media.speech/x86_64-windows/classes_r.res
  LINK   dlls/windows.media.speech/x86_64-windows/windows.media.speech.dll
  LINK   dlls/windows.media.speech/windows.media.speech.so
Wine build complete.
```

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2241

[PATCH 1/1] makedep: Better differentiate between compiling and linking commands.

[Bernhard Kölbl]

From: Bernhard Kölbl <besentv(a)gmail.com>

Improves readability in silent configuration.

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com>
---
 tools/makedep.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tools/makedep.c b/tools/makedep.c
index 532145de292..61798445d2a 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -2417,7 +2417,7 @@ static const char *cmd_prefix( const char *cmd )
  */
 static void output_winegcc_command( struct makefile *make, unsigned int arch )
 {
-    output( "\t%s%s -o $@", cmd_prefix( "CCLD" ), tools_path( make, "winegcc" ));
+    output( "\t%s%s -o $@", cmd_prefix( "LINK" ), tools_path( make, "winegcc" ));
     output_filename( "--wine-objdir ." );
     if (tools_dir)
     {
@@ -3163,7 +3163,7 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou
         strarray_add( &make->clean_files, obj_name );
 
     output( "%s: %s\n", obj_dir_path( make, obj_name ), source->filename );
-    output( "\t%s%s -c -o $@ %s", cmd_prefix( "CC" ), arch_make_variable( "CC", arch ), source->filename );
+    output( "\t%s%s -c -o $@ %s", cmd_prefix( arch ? "PE" : "UNIX" ), arch_make_variable( "CC", arch ), source->filename );
     output_filenames( defines );
     if (!source->use_msvcrt) output_filenames( make->unix_cflags );
     output_filenames( make->extlib ? extra_cflags_extlib[arch] : extra_cflags[arch] );
@@ -3432,7 +3432,7 @@ static void output_unix_lib( struct makefile *make )
     output_filenames_obj_dir( make, make->unixobj_files );
     output_filenames( unix_deps );
     output( "\n" );
-    output( "\t%s$(CC) -o $@", cmd_prefix( "CCLD" ));
+    output( "\t%s$(CC) -o $@", cmd_prefix( "LINK" ));
     output_filenames( get_expanded_make_var_array( make, "UNIXLDFLAGS" ));
     output_filenames_obj_dir( make, make->unixobj_files );
     output_filenames( unix_libs );
@@ -3488,7 +3488,7 @@ static void output_shared_lib( struct makefile *make )
     output_filenames_obj_dir( make, make->object_files[arch] );
     output_filenames( dep_libs );
     output( "\n" );
-    output( "\t%s$(CC) -o $@", cmd_prefix( "CCLD" ));
+    output( "\t%s$(CC) -o $@", cmd_prefix( "LINK" ));
     output_filenames_obj_dir( make, make->object_files[arch] );
     output_filenames( all_libs );
     output_filename( "$(LDFLAGS)" );
@@ -3610,7 +3610,7 @@ static void output_programs( struct makefile *make )
         output_filenames_obj_dir( make, objs );
         output_filenames( deps );
         output( "\n" );
-        output( "\t%s$(CC) -o $@", cmd_prefix( "CCLD" ));
+        output( "\t%s$(CC) -o $@", cmd_prefix( "LINK" ));
         output_filenames_obj_dir( make, objs );
         output_filenames( all_libs );
         output_filename( "$(LDFLAGS)" );
@@ -4109,14 +4109,15 @@ static void output_silent_rules(void)
     {
         "BISON",
         "BUILD",
-        "CC",
-        "CCLD",
         "FLEX",
         "GEN",
+        "LINK",
         "LN",
         "MSG",
+        "PE",
         "SED",
         "TEST",
+        "UNIX",
         "WIDL",
         "WMC",
         "WRC"
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2241

[Alexandre Julliard (＠julliard)]

CC/CCLD is the standard format used by all automake-based projects. I don't think that inventing our own names is an improvement.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2241#note_24989

[PATCH 0/1] MR2241: makedep: Better differentiate between compiling and linking commands. - closed

[Bernhard Kölbl]

This merge request was closed by Bernhard Kölbl.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2241