Remove WINDOWS_LDADD
authorEric Biggers <ebiggers3@gmail.com>
Thu, 4 Sep 2014 04:20:53 +0000 (23:20 -0500)
committerEric Biggers <ebiggers3@gmail.com>
Thu, 4 Sep 2014 04:20:55 +0000 (23:20 -0500)
Linking with shlwapi is no longer needed.

Makefile.am
configure.ac

index 18c7f31..cff4aa8 100644 (file)
@@ -174,8 +174,7 @@ libwim_la_LIBADD =          \
        $(LTLIBICONV)           \
        $(LIBCRYPTO_LIBS)       \
        $(SSSE3_SHA1_OBJ)       \
-       $(PTHREAD_LDADD)        \
-       $(WINDOWS_LDADD)
+       $(PTHREAD_LDADD)
 
 libwim_la_CFLAGS =             \
        $(AM_CFLAGS)            \
index 04e5a64..c98df10 100644 (file)
@@ -178,7 +178,6 @@ VISIBILITY_CFLAGS="-fvisibility=hidden"
 WINDOWS_CFLAGS=""
 WINDOWS_CPPFLAGS=""
 WINDOWS_LDFLAGS=""
-WINDOWS_LDADD=""
 
 case "$host_os" in
        mingw*)
@@ -188,7 +187,6 @@ case "$host_os" in
                WINDOWS_CFLAGS="-municode"
                WINDOWS_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS"
                WINDOWS_LDFLAGS="-no-undefined"
-               WINDOWS_LDADD="-lshlwapi"
                ;;
        linux*)
                # Linux
@@ -203,7 +201,6 @@ esac
 
 AC_SUBST([VISIBILITY_CFLAGS], [$VISIBILITY_CFLAGS])
 AC_SUBST([WINDOWS_LDFLAGS], [$WINDOWS_LDFLAGS])
-AC_SUBST([WINDOWS_LDADD], [$WINDOWS_LDADD])
 AC_SUBST([WINDOWS_CPPFLAGS], [$WINDOWS_CPPFLAGS])
 AC_SUBST([WINDOWS_CFLAGS], [$WINDOWS_CFLAGS])
 AM_CONDITIONAL([WINDOWS_NATIVE_BUILD], [test "x$WINDOWS_NATIVE_BUILD" = "xyes"])