makefiles: Get rid of the libwine.so symlink.

We no longer need to link to libwine. Signed-off-by: Alexandre Julliard <julliard@winehq.org>

makefiles: Get rid of the libwine.so symlink.
497c9028 · Alexandre Julliard · 2e115ab4 · 497c9028 · 497c9028 · 497c9028
Commit 497c9028 authored Dec 04, 2020 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

configure configure +0 -2

configure.ac configure.ac +0 -2

makedep.c tools/makedep.c +0 -3

No files found.
--- 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


--- 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


--- 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;
 }