makefiles: Explicitly name the Unix library in the makefile instead of using --subsystem unixlib.

dlls/avicap32/Makefile.in

 MODULE    = avicap32.dll
+UNIXLIB   = avicap32.so
 IMPORTLIB = avicap32
 IMPORTS   = user32
-EXTRALIBS = -Wl,--subsystem,unixlib
 
 C_SRCS = \
 	avicap32_main.c \

dlls/msv1_0/Makefile.in

 MODULE    = msv1_0.dll
+UNIXLIB   = msv1_0.so
 IMPORTS   = netapi32 advapi32
-EXTRALIBS = -Wl,--subsystem,unixlib
 
 C_SRCS = \
 	main.c \

dlls/netapi32/Makefile.in

 EXTRADEFS = -D_SVRAPI_
 MODULE    = netapi32.dll
+UNIXLIB   = netapi32.so
 IMPORTLIB = netapi32
 IMPORTS   = rpcrt4 iphlpapi ws2_32 advapi32 dnsapi
-EXTRALIBS = -Wl,--subsystem,unixlib
 
 C_SRCS = \
 	nbcmdqueue.c \

dlls/ntdll/Makefile.in

 EXTRADEFS = -D_NTSYSTEM_ -D_ACRTIMP= -DWINBASEAPI=
 MODULE    = ntdll.dll
+UNIXLIB   = ntdll.so
 IMPORTLIB = ntdll
 IMPORTS   = winecrt0
 EXTRAINCL = $(UNWIND_CFLAGS)
-EXTRALIBS = -lwinecrt0 -Wl,--subsystem,unixlib $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS)
+EXTRALIBS = -lwinecrt0 $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS)
 
 EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000
 

dlls/odbc32/Makefile.in

 MODULE    = odbc32.dll
+UNIXLIB   = odbc32.so
 IMPORTLIB = odbc32
 IMPORTS   = advapi32
-EXTRALIBS = -Wl,--subsystem,unixlib
 
 C_SRCS = \
 	proxyodbc.c \

dlls/win32u/Makefile.in

 MODULE    = win32u.dll
+UNIXLIB   = win32u.so
 IMPORTLIB = win32u
 IMPORTS   = ntdll winecrt0
-EXTRALIBS = -Wl,--subsystem,unixlib
 
 EXTRADLLFLAGS = -nodefaultlibs -Wb,--syscall-table,1
 

dlls/winebus.sys/Makefile.in

 MODULE    = winebus.sys
+UNIXLIB   = winebus.so
 IMPORTS   = ntoskrnl advapi32
-EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) $(PTHREAD_LIBS) -Wl,--subsystem,unixlib
+EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) $(PTHREAD_LIBS)
 EXTRAINCL = $(UDEV_CFLAGS) $(SDL2_CFLAGS)
 
 EXTRADLLFLAGS = -Wl,--subsystem,native

dlls/winepulse.drv/Makefile.in

 MODULE    = winepulse.drv
+UNIXLIB   = winepulse.so
 IMPORTS   = dxguid uuid winmm user32 advapi32 ole32
-EXTRALIBS = $(PULSE_LIBS) $(PTHREAD_LIBS) -Wl,--subsystem,unixlib
+EXTRALIBS = $(PULSE_LIBS) $(PTHREAD_LIBS)
 EXTRAINCL = $(PULSE_CFLAGS)
 
 C_SRCS = \

dlls/ws2_32/Makefile.in

 MODULE    = ws2_32.dll
+UNIXLIB   = ws2_32.so
 IMPORTLIB = ws2_32
 DELAYIMPORTS = advapi32 iphlpapi user32
-EXTRALIBS = $(POLL_LIBS) -Wl,--subsystem,unixlib
+EXTRALIBS = $(POLL_LIBS)
 
 C_SRCS = \
 	async.c \

tools/makedep.c

@@ -204,6 +204,7 @@ struct makefile
     const char     *staticimplib;
     const char     *importlib;
     const char     *unixlib;
+    int             native_unix_lib;
     int             disabled;
     int             use_msvcrt;
     int             is_cross;
@@ -2140,7 +2141,7 @@ static const char *get_static_lib( const struct makefile *make, const char *name
  */
 static const char *get_native_unix_lib( const struct makefile *make, const char *name )
 {
-    if (!make->unixlib) return NULL;
+    if (!make->native_unix_lib) return NULL;
     if (strncmp( make->unixlib, name, strlen(name) )) return NULL;
     if (make->unixlib[strlen(name)] != '.') return NULL;
     return obj_dir_path( make, make->unixlib );
@@ -2198,15 +2199,14 @@ static int needs_implib_symlink( const struct makefile *make )
 /*******************************************************************
  *         add_unix_libraries
  */
-static struct strarray add_unix_libraries( const struct makefile *make, struct strarray *deps,
-                                           int native_unix )
+static struct strarray add_unix_libraries( const struct makefile *make, struct strarray *deps )
 {
     struct strarray ret = empty_strarray;
     struct strarray all_libs = empty_strarray;
     unsigned int i, j;
 
     strarray_add( &all_libs, "-lwine_port" );
-    if (native_unix && strcmp( make->module, "ntdll.dll" )) strarray_add( &all_libs, "-lntdll" );
+    if (make->native_unix_lib && strcmp( make->unixlib, "ntdll.so" )) strarray_add( &all_libs, "-lntdll" );
     strarray_addall( &all_libs, get_expanded_make_var_array( make, "EXTRALIBS" ));
     strarray_addall( &all_libs, libs );
 
@@ -2220,7 +2220,7 @@ static struct strarray add_unix_libraries( const struct makefile *make, struct s
 
             for (j = 0; j < subdirs.count; j++)
                 if ((lib = get_static_lib( submakes[j], name ))) break;
-            if (!lib && native_unix)
+            if (!lib && make->native_unix_lib)
                 for (j = 0; j < subdirs.count; j++)
                     if ((lib = get_native_unix_lib( submakes[j], name ))) break;
         }
@@ -3342,7 +3342,7 @@ static void output_module( struct makefile *make )
     }
     else if (*dll_ext)
     {
-        if (!make->use_msvcrt) strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs, 0 ));
+        if (!make->use_msvcrt) strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs ));
         for (i = 0; i < make->delayimports.count; i++)
             strarray_add( &all_libs, strmake( "-Wl,-delayload,%s%s", make->delayimports.str[i],
                                               strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" ));
@@ -3356,7 +3356,7 @@ static void output_module( struct makefile *make )
     }
     else
     {
-        strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs, 0 ));
+        strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs ));
         strarray_add( &make->all_targets, make->module );
         add_install_rule( make, make->module, make->module,
                           strmake( "p$(%s)/%s", spec_file ? "dlldir" : "bindir", make->module ));
@@ -3390,10 +3390,8 @@ static void output_module( struct makefile *make )
     {
         struct strarray unix_libs = empty_strarray;
         struct strarray unix_deps = empty_strarray;
-        struct strarray extra_libs = get_expanded_make_var_array( make, "EXTRALIBS" );
-        int native_unix_lib = strarray_exists( &extra_libs, "-Wl,--subsystem,unixlib" );
 
-        if (!native_unix_lib)
+        if (!make->native_unix_lib)
         {
             struct strarray unix_imports = empty_strarray;
 
@@ -3408,20 +3406,20 @@ static void output_module( struct makefile *make )
             strarray_addall( &unix_libs, add_import_libs( make, &unix_deps, unix_imports, 0, 1 ));
         }
 
-        strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps, native_unix_lib ));
+        strarray_addall( &unix_libs, add_unix_libraries( make, &unix_deps ));
 
         strarray_add( &make->all_targets, make->unixlib );
         add_install_rule( make, make->module, make->unixlib, strmake( "p%s/%s", so_dir, make->unixlib ));
         output( "%s:", obj_dir_path( make, make->unixlib ));
         output_filenames_obj_dir( make, make->unixobj_files );
         output_filenames( unix_deps );
-        if (!native_unix_lib) output_filename( tools_path( make, "winebuild" ));
+        if (!make->native_unix_lib) output_filename( tools_path( make, "winebuild" ));
         output_filename( tools_path( make, "winegcc" ));
         output( "\n" );
         output_winegcc_command( make, 0 );
         output_filename( "-munix" );
         output_filename( "-shared" );
-        if (spec_file && !native_unix_lib) output_filename( spec_file );
+        if (spec_file && !make->native_unix_lib) output_filename( spec_file );
         if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) output_filename( "-nodefaultlibs" );
         output_filenames_obj_dir( make, make->unixobj_files );
         output_filenames( unix_libs );
@@ -3555,7 +3553,7 @@ static void output_shared_lib( struct makefile *make )
 
     strarray_addall( &dep_libs, get_local_dependencies( make, basename, make->in_files ));
     strarray_addall( &all_libs, get_expanded_file_local_var( make, basename, "LDFLAGS" ));
-    strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs, 0 ));
+    strarray_addall( &all_libs, add_unix_libraries( make, &dep_libs ));
 
     output( "%s:", obj_dir_path( make, make->sharedlib ));
     output_filenames_obj_dir( make, make->object_files );
@@ -3669,7 +3667,7 @@ static void output_programs( struct makefile *make )
 
         if (!objs.count) objs = make->object_files;
         if (!strarray_exists( &all_libs, "-nodefaultlibs" ))
-            strarray_addall( &all_libs, add_unix_libraries( make, &deps, 0 ));
+            strarray_addall( &all_libs, add_unix_libraries( make, &deps ));
 
         output( "%s:", obj_dir_path( make, program ) );
         output_filenames_obj_dir( make, objs );
@@ -4241,6 +4239,7 @@ static void load_sources( struct makefile *make )
     make->sharedlib     = get_expanded_make_variable( make, "SHAREDLIB" );
     make->staticlib     = get_expanded_make_variable( make, "STATICLIB" );
     make->importlib     = get_expanded_make_variable( make, "IMPORTLIB" );
+    if (*dll_ext) make->unixlib = get_expanded_make_variable( make, "UNIXLIB" );
 
     make->programs      = get_expanded_make_var_array( make, "PROGRAMS" );
     make->scripts       = get_expanded_make_var_array( make, "SCRIPTS" );
@@ -4259,6 +4258,7 @@ static void load_sources( struct makefile *make )
                        !strarray_exists( &make->extradllflags, "-mcygwin" );
     make->is_exe     = strarray_exists( &make->extradllflags, "-mconsole" ) ||
                        strarray_exists( &make->extradllflags, "-mwindows" );
+    make->native_unix_lib = !!make->unixlib;
 
     if (make->use_msvcrt) strarray_add_uniq( &make->extradllflags, "-mno-cygwin" );
 
@@ -4300,7 +4300,7 @@ static void load_sources( struct makefile *make )
     }
 
     add_generated_sources( make );
-    make->unixlib = get_unix_lib_name( make );
+    if (!make->unixlib) make->unixlib = get_unix_lib_name( make );
 
     if (make->use_msvcrt) add_crt_import( make, &make->imports, &make->define_args );
 

tools/winegcc/winegcc.c

@@ -528,7 +528,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name )
         if (opts->unicode_app) strarray_add( flags, "-municode" );
         if (opts->nodefaultlibs || opts->use_msvcrt) strarray_add( flags, "-nodefaultlibs" );
         if (opts->nostartfiles || opts->use_msvcrt) strarray_add( flags, "-nostartfiles" );
-        if (opts->subsystem && strcmp(opts->subsystem, "unixlib")) strarray_add( flags, strmake("-Wl,--subsystem,%s", opts->subsystem ));
+        if (opts->subsystem) strarray_add( flags, strmake("-Wl,--subsystem,%s", opts->subsystem ));
 
         strarray_add( flags, "-Wl,--nxcompat" );
 
@@ -568,7 +568,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name )
         if (opts->nodefaultlibs || opts->use_msvcrt) strarray_add( flags, "-nodefaultlibs" );
         if (opts->nostartfiles || opts->use_msvcrt) strarray_add( flags, "-nostartfiles" );
         if (opts->image_base) strarray_add( flags, strmake("-Wl,-base:%s", opts->image_base ));
-        if (opts->subsystem && strcmp(opts->subsystem, "unixlib"))
+        if (opts->subsystem)
             strarray_add( flags, strmake("-Wl,-subsystem:%s", opts->subsystem ));
         else
             strarray_add( flags, strmake("-Wl,-subsystem:%s", opts->gui_app ? "windows" : "console" ));
@@ -1088,7 +1088,7 @@ static const char *find_libgcc(const strarray *prefix, const strarray *link_tool
 /* add specified library to the list of files */
 static void add_library( struct options *opts, strarray *lib_dirs, strarray *files, const char *library )
 {
-    char *static_lib, *fullname = 0, *unixlib;
+    char *static_lib, *fullname = 0;
 
     switch(get_lib_type(opts->target_platform, lib_dirs, library, "lib", opts->lib_suffix, &fullname))
     {
@@ -1096,19 +1096,6 @@ static void add_library( struct options *opts, strarray *lib_dirs, strarray *fil
         strarray_add(files, strmake("-a%s", fullname));
         break;
     case file_dll:
-        if (opts->unix_lib && opts->subsystem && !strcmp(opts->subsystem, "unixlib"))
-        {
-            if (get_lib_type(opts->target_platform, lib_dirs, library, "", ".so", &unixlib) == file_so)
-            {
-                strarray_add(files, strmake("-s%s", unixlib));
-                free(unixlib);
-            }
-            else
-            {
-                strarray_add(files, strmake("-l%s", library));
-            }
-            break;
-        }
         strarray_add(files, strmake("-d%s", fullname));
         if ((static_lib = find_static_lib(fullname)))
         {
@@ -1182,7 +1169,7 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file,
         strarray_add(spec_args, entry_point);
     }
 
-    if (opts->subsystem && strcmp( opts->subsystem, "unixlib" ))
+    if (opts->subsystem)
     {
         strarray_add(spec_args, "--subsystem");
         strarray_add(spec_args, opts->subsystem);
@@ -1387,7 +1374,7 @@ static void build(struct options* opts)
     else entry_point = opts->entry_point;
 
     /* run winebuild to generate the .spec.o file */
-    if (!(opts->unix_lib && opts->subsystem && !strcmp(opts->subsystem, "unixlib")))
+    if (spec_file || !opts->unix_lib)
         spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point );
 
     if (fake_module) return;  /* nothing else to do */