From 497c902857241ec340e562ec3490a344704440dc Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 4 Dec 2020 11:09:17 +0100
Subject: [PATCH] makefiles: Get rid of the libwine.so symlink.

We no longer need to link to libwine.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 configure       | 2 --
 configure.ac    | 2 --
 tools/makedep.c | 3 ---
 3 files changed, 7 deletions(-)

diff --git a/configure b/configure
index d8759253727..ea6a82086bf 100755
--- a/configure
+++ b/configure
@@ -9120,7 +9120,6 @@ fi
     WINELOADER_DEPENDS="wine_info.plist"
 
     TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.$libwine_version.dylib libs/wine/libwine.$libwine_soversion.dylib"
-    TOP_INSTALL_DEV="$TOP_INSTALL_DEV libs/wine/libwine.dylib"
     ;;
 
   linux-android*)
@@ -9599,7 +9598,6 @@ $as_echo "$ac_cv_c_dll_unixware" >&6; }
     LIBWINE_DEPENDS="wine.map"
 
     TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version libs/wine/libwine.so.$libwine_soversion"
-    TOP_INSTALL_DEV="$TOP_INSTALL_DEV libs/wine/libwine.so"
     ;;
 esac
 
diff --git a/configure.ac b/configure.ac
index 168df52f791..020fd19256f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -887,7 +887,6 @@ case $host_os in
     AC_SUBST(LIBWINE_LDFLAGS,["-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"])
     AC_SUBST(WINELOADER_DEPENDS,"wine_info.plist")
     TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.$libwine_version.dylib libs/wine/libwine.$libwine_soversion.dylib"
-    TOP_INSTALL_DEV="$TOP_INSTALL_DEV libs/wine/libwine.dylib"
     ;;
 
   linux-android*)
@@ -980,7 +979,6 @@ case $host_os in
     AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
     AC_SUBST(LIBWINE_DEPENDS,"wine.map")
     TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version libs/wine/libwine.so.$libwine_soversion"
-    TOP_INSTALL_DEV="$TOP_INSTALL_DEV libs/wine/libwine.so"
     ;;
 esac
 
diff --git a/tools/makedep.c b/tools/makedep.c
index d892b7e9541..b21362c6c9e 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -2388,9 +2388,6 @@ static struct strarray get_shared_lib_names( const char *libname )
         strcpy( second, ext );
         strarray_add( &ret, xstrdup( name ));
     }
-    /* now remove all digits */
-    strcpy( first, ext );
-    strarray_add( &ret, name );
     return ret;
 }