Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmake

use WIRESHARK_LIB_DIR for the location of our external libraries.

svn path=/trunk/; revision=38119

1 files changed, 34 insertions, 34 deletions

diff --git a/config.nmake b/config.nmake
index 2feaccad58..d25249e5ca 100644
--- a/config.nmake
+++ b/config.nmake
@@ -36,8 +36,8 @@ WTAP_VERSION_MICRO=0
 # compile the sources. This setting is used only inside this file.
 # This can be defined in the system environment.
 #
-!IFNDEF WIRESHARK_LIBS
-WIRESHARK_LIBS=C:\wireshark-$(WIRESHARK_TARGET_PLATFORM)-libs
+!IFNDEF WIRESHARK_LIB_DIR
+WIRESHARK_LIB_DIR=C:\wireshark-$(WIRESHARK_TARGET_PLATFORM)-libs
 !ENDIF
 
 #
@@ -145,7 +145,7 @@ MSVC_VARIANT=MSVC2008
 # If you don't have NASM, comment this line out, so that NASM
 # isn't defined.
 #
-NASM=$(WIRESHARK_LIBS)\nasm-2.09.08\nasm.exe
+NASM=$(WIRESHARK_LIB_DIR)\nasm-2.09.08\nasm.exe
 
 #
 # Optional: the Python library enables scripting support.
@@ -236,7 +236,7 @@ GLIB_VERSION=2.0
 # If you want building with GTK+, set GTK_DIR to the pathname of the
 # directory in which the "include" and "lib" directories reside.
 #
-GTK_DIR=$(WIRESHARK_LIBS)\gtk2
+GTK_DIR=$(WIRESHARK_LIB_DIR)\gtk2
 # These macros are used by the nsis installer script and by the install target.
 PNG_DLL=libpng14-14.dll
 FREETYPE_DLL=freetype6.dll
@@ -265,7 +265,7 @@ GTK_INST_VERSION=2.22
 # If you don't have the WPdpack, comment this line out, so that
 # PCAP_DIR isn't defined.
 #
-PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
+PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack
 # This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
 PCAP_VERSION=4_1_2
 
@@ -285,7 +285,7 @@ PCAP_REMOTE=1
 # If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't
 # defined.
 # EXperimental only use zlib 1.2.5 on win32 for now
-ZLIB_DIR=$(WIRESHARK_LIBS)\zlib125
+ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125
 
 #
 # Optional: the ADNS library enables asynchronous (nonblocking) DNS
@@ -299,7 +299,7 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib125
 #
 # If C_ARES_DIR is defined below, it will override this setting.
 #
-#ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05ws
+#ADNS_DIR=$(WIRESHARK_LIB_DIR)\adns-1.0-win32-05ws
 
 #
 # Optional: the c-ares library enables asynchronous (nonblocking) DNS
@@ -337,7 +337,7 @@ GNUTLS_PKG=2.10.3-1.11
 # If you don't have KFW, comment this line out, so that KFW_DIR
 # isn't defined.
 #
-KFW_DIR=$(WIRESHARK_LIBS)\kfw-3-2-2-i386-ws-vc6
+KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3-2-2-i386-ws-vc6
 
 #
 # Optional: the Nettle library enables ??? decryption.
@@ -348,7 +348,7 @@ KFW_DIR=$(WIRESHARK_LIBS)\kfw-3-2-2-i386-ws-vc6
 # If you don't have Nettle, comment this line out, so that NETTLE_DIR
 # isn't defined.
 #
-# NETTLE_DIR=$(WIRESHARK_LIBS)\nettle-1.10
+# NETTLE_DIR=$(WIRESHARK_LIB_DIR)\nettle-1.10
 
 #
 # Optional: the LUA library enables scripting support.
@@ -360,7 +360,7 @@ KFW_DIR=$(WIRESHARK_LIBS)\kfw-3-2-2-i386-ws-vc6
 # isn't defined.
 #
 LUA_DIST=5_1_4_Win32_dll6
-LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.4
+LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.1.4
 
 #
 # Optional: the PORTAUDIO library enables audio output for RTP streams.
@@ -371,8 +371,8 @@ LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.4
 # If you don't have PORTAUDIO, comment this line out, so that
 # PORTAUDIO_DIR isn't defined.
 #
-#PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1
-PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2
+#PORTAUDIO_DIR=$(WIRESHARK_LIB_DIR)\portaudio_v18_1
+PORTAUDIO_DIR=$(WIRESHARK_LIB_DIR)\portaudio_v19_2
 
 #
 # Version number of PortAudio
@@ -390,7 +390,7 @@ PORTAUDIO_VERSION=19
 # If you don't have the AirPcap developer's pack, comment this line out,
 # so that AIRPCAP_DIR isn't defined.
 #
-AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack
+AIRPCAP_DIR=$(WIRESHARK_LIB_DIR)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack
 
 #
 # Optional: LIBSMI, System Management Interface
@@ -408,7 +408,7 @@ SMI_PKG=svn-40773
 # However, the Microsoft Platform SDK for Windows Server 2003 R2 provides
 # these definitions. The SDK's SetEnv.bat script defines INETSDK.
 !IF "$(MSVC_VARIANT)" != "MSVC6" || DEFINED(INETSDK)
-GEOIP_DIR=$(WIRESHARK_LIBS)\GeoIP-1.4.6-win32ws\libGeoIP
+GEOIP_DIR=$(WIRESHARK_LIB_DIR)\GeoIP-1.4.6-win32ws\libGeoIP
 !ENDIF
 
 !else
@@ -428,7 +428,7 @@ GLIB_VERSION=2.0
 # If you want building with GTK+, set GTK_DIR to the pathname of the
 # directory in which the "include" and "lib" directories reside.
 #
-GTK_DIR=$(WIRESHARK_LIBS)\gtk2
+GTK_DIR=$(WIRESHARK_LIB_DIR)\gtk2
 # These macros are used by the nsis installer script and by the install target.
 PNG_DLL=libpng14-14.dll
 #TIFF_DLL=libtiff-3.dll
@@ -460,7 +460,7 @@ GTK_INST_VERSION=2.22
 # If you don't have the WPdpack, comment this line out, so that
 # PCAP_DIR isn't defined.
 #
-PCAP_DIR=$(WIRESHARK_LIBS)\WPdpack
+PCAP_DIR=$(WIRESHARK_LIB_DIR)\WPdpack
 # This macro is used by the nsis installer script, by the u3/portable apps and by the setup target.
 PCAP_VERSION=4_1_2
 
@@ -480,7 +480,7 @@ PCAP_REMOTE=1
 # If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't
 # defined.
 #
-ZLIB_DIR=$(WIRESHARK_LIBS)\zlib125
+ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125
 
 #
 # Optional: the ADNS library enables asynchronous (nonblocking) DNS
@@ -494,7 +494,7 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib125
 #
 # If C_ARES_DIR is defined below, it will override this setting.
 #
-#ADNS_DIR=$(WIRESHARK_LIBS)\adns-1.0-win32-05ws
+#ADNS_DIR=$(WIRESHARK_LIB_DIR)\adns-1.0-win32-05ws
 
 #
 # Optional: the c-ares library enables asynchronous (nonblocking) DNS
@@ -532,7 +532,7 @@ GNUTLS_PKG=2.10.3-1.7
 # If you don't have KFW, comment this line out, so that KFW_DIR
 # isn't defined.
 #
-#KFW_DIR=$(WIRESHARK_LIBS)\kfw-3.2.2-ws1
+#KFW_DIR=$(WIRESHARK_LIB_DIR)\kfw-3.2.2-ws1
 
 #
 # Optional: the Nettle library enables ??? decryption.
@@ -543,7 +543,7 @@ GNUTLS_PKG=2.10.3-1.7
 # If you don't have Nettle, comment this line out, so that NETTLE_DIR
 # isn't defined.
 #
-# NETTLE_DIR=$(WIRESHARK_LIBS)\nettle-1.10
+# NETTLE_DIR=$(WIRESHARK_LIB_DIR)\nettle-1.10
 
 #
 # Optional: the LUA library enables scripting support.
@@ -555,7 +555,7 @@ GNUTLS_PKG=2.10.3-1.7
 # isn't defined.
 #
 LUA_DIST=5_1_4_Win64_dll9
-LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.4
+LUA_DIR=$(WIRESHARK_LIB_DIR)\lua5.1.4
 
 #
 # Optional: the PORTAUDIO library enables audio output for RTP streams.
@@ -566,8 +566,8 @@ LUA_DIR=$(WIRESHARK_LIBS)\lua5.1.4
 # If you don't have PORTAUDIO, comment this line out, so that
 # PORTAUDIO_DIR isn't defined.
 #
-#PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v18_1
-PORTAUDIO_DIR=$(WIRESHARK_LIBS)\portaudio_v19_2
+#PORTAUDIO_DIR=$(WIRESHARK_LIB_DIR)\portaudio_v18_1
+PORTAUDIO_DIR=$(WIRESHARK_LIB_DIR)\portaudio_v19_2
 
 #
 # Version number of PortAudio
@@ -585,7 +585,7 @@ PORTAUDIO_VERSION=19
 # If you don't have the AirPcap developer's pack, comment this line out,
 # so that AIRPCAP_DIR isn't defined.
 #
-AIRPCAP_DIR=$(WIRESHARK_LIBS)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack
+AIRPCAP_DIR=$(WIRESHARK_LIB_DIR)\AirPcap_Devpack_4_1_0_1622\AirPcap_Devpack
 
 #
 # Optional: LIBSMI, System Management Interface
@@ -599,7 +599,7 @@ SMI_PKG=svn-40773
 #
 # Used to map IP addresses to MaxMind GeoIP database entries
 #
-GEOIP_DIR=$(WIRESHARK_LIBS)\GeoIP-1.4.6-win64ws\libGeoIP
+GEOIP_DIR=$(WIRESHARK_LIB_DIR)\GeoIP-1.4.6-win64ws\libGeoIP
 
 !endif
 
@@ -708,7 +708,7 @@ HHC_DIR=$(PROGRAM_FILES)/HTML Help Workshop
 # comment this line out, so that UPX isn't defined.
 #
 
-UPX=$(WIRESHARK_LIBS)\upx303w\upx.exe
+UPX=$(WIRESHARK_LIB_DIR)\upx303w\upx.exe
 
 ##### Flags, PATHs and Miscellaneous #####
 
@@ -891,7 +891,7 @@ INSTALL_DIR=wireshark-gtk2
 !ELSEIF "$(WIRESHARK_TARGET_PLATFORM)" == "win64"
 # We're not creating portable packages and therefore don't have to worry about
 # "deploying using xcopy"
-VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe
+VCREDIST_EXE=$(WIRESHARK_LIB_DIR)\vcredist_$(TARGET_MACHINE).exe
 
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2002"
 # you probably need to tweak this directory if you don't use the professional edition!
@@ -913,7 +913,7 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\$(PROCESSOR_ARCHI
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE"
 # you need to download the redistributable package vcredist_x86.exe from Microsoft first,
 # and copy it to the lib folder!!!
-VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe
+VCREDIST_EXE=$(WIRESHARK_LIB_DIR)\vcredist_$(TARGET_MACHINE).exe
 
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2008"
 MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC90.CRT\*.*
@@ -921,7 +921,7 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(PROCESSOR_ARC
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2010EE"
 # you need to download the redistributable package vcredist_x86.exe from Microsoft first,
 # and copy it to the lib folder!!!
-VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe
+VCREDIST_EXE=$(WIRESHARK_LIB_DIR)\vcredist_$(TARGET_MACHINE).exe
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2010"
 MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 10.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT\*.*
 
@@ -1135,7 +1135,7 @@ ZLIB_CONFIG=
 
 !IFDEF C_ARES_PKG
 !UNDEF ADNS_DIR
-C_ARES_DIR=$(WIRESHARK_LIBS)\c-ares-$(C_ARES_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
+C_ARES_DIR=$(WIRESHARK_LIB_DIR)\c-ares-$(C_ARES_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
 C_ARES_CFLAGS=/I$(C_ARES_DIR)/include
 C_ARES_LIBS=$(C_ARES_DIR)\lib\libcares-2.lib
 C_ARES_DLL=$(C_ARES_DIR)\bin\libcares-2.dll
@@ -1148,8 +1148,8 @@ C_ARES_CONFIG=
 !IFDEF ADNS_DIR
 ADNS_PATH=$(ADNS_DIR)\adns_win32\lib
 ADNS_CFLAGS=/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32
-ADNS_LIBS=$(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns\adns_dll.lib
-ADNS_DLL=$(WIRESHARK_LIBS)\$(MSVC_VARIANT)\adns\adns_dll.dll
+ADNS_LIBS=$(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns\adns_dll.lib
+ADNS_DLL=$(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns\adns_dll.dll
 # Nmake uses carets to escape special characters
 ADNS_CONFIG=^#define HAVE_GNU_ADNS 1
 !else
@@ -1183,7 +1183,7 @@ NETTLE_CONFIG=
 !ENDIF
 
 !IFDEF GNUTLS_PKG
-GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
+GNUTLS_DIR=$(WIRESHARK_LIB_DIR)\gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
 GNUTLS_PATH=$(GNUTLS_DIR)
 # /DNOCRYPT avoids inclusion of Wincrypt.h, avoiding a X509_NAME define clash
 GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT /DIMPORT_LIGNUTLSDLL
@@ -1255,7 +1255,7 @@ HHC_LIBS=
 !ENDIF
 
 !IFDEF SMI_PKG
-SMI_DIR=$(WIRESHARK_LIBS)\libsmi-$(SMI_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
+SMI_DIR=$(WIRESHARK_LIB_DIR)\libsmi-$(SMI_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws
 SMI_CONFIG=^#define HAVE_LIBSMI 1
 SMI_CFLAGS=/I$(SMI_DIR)\include
 SMI_LIBS=$(SMI_DIR)\lib\libsmi-2.lib