CVARSDLL hasn't been used (is undefined) for a while....

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@41180 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index fe3b3f8094698e17b331688878ebb53a49d941af..4ed1df8fa0ca8747910f4838ecfcdfda45371923 100644 (file)
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -60,7 +60,7 @@ libwireshark_LIBS = \
        dissectors\dissectors.lib
 
 .c.obj::
-       $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
+       $(CC) $(CFLAGS) -Fd.\ -c $<
 
 LIBWIRESHARK_OBJECTS = $(LIBWIRESHARK_ALL_SRC:.c=.obj)
 
@@ -297,23 +297,23 @@ RUNLEX=..\tools\runlex.sh
 
 diam_dict_lex.h: diam_dict.c
 diam_dict.obj : diam_dict.c
-       $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -c $?
+       $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $?
 
 dtd_parse_lex.h: dtd_parse.c
 dtd_parse.obj : dtd_parse.c
-       $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -c $?
+       $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $?
 
 dtd_preparse_lex.h: dtd_preparse.c
 dtd_preparse.obj : dtd_preparse.c
-       $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -c $?
+       $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $?
 
 radius_dict_lex.h: radius_dict.c
 radius_dict.obj : radius_dict.c
-       $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -c $?
+       $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $?
 
 uat_load_lex.h: uat_load.c
 uat_load.obj : uat_load.c
-       $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -c $?
+       $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $?
 
 LEMON=..\tools\lemon
 

diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index 36bd3938a422ca973d03203d1ec596fba7a05e2c..97b8ba6739b6dd002531427c4c1bfcbd6655bc54 100644 (file)
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -20,7 +20,7 @@ GENERATED_CFLAGS=\
 CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
 
 .c.obj::
-   $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
+   $(CC) $(CFLAGS) -Fd.\ -c $<
 
 OBJECTS=$(NONGENERATED_C_FILES:.c=.obj) $(GENERATED_C_FILES:.c=.obj)
 
@@ -55,7 +55,7 @@ RUNLEX=..\..\tools\runlex.sh
 
 scanner_lex.h : scanner.c
 scanner.obj : scanner.c grammar.h
-       $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -c scanner.c
+       $(CC) $(GENERATED_CFLAGS) -Fd.\ -c scanner.c
 
 grammar.h : grammar.c
 grammar.c : $(LEMON)\lemon.exe $(LEMON)\lempar.c grammar.lemon

diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake
index 59d1a6ed8e6021e03e53c5380a918213c68f6b6e..3e6a1d9c2adfd3cc7a562a187448910f19a81ef9 100644 (file)
--- a/epan/dissectors/Makefile.nmake
+++ b/epan/dissectors/Makefile.nmake
@@ -19,7 +19,7 @@ CFLAGS= $(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
        /I$(PCAP_DIR)\include
 
 .c.obj::
-   $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
+   $(CC) $(CFLAGS) -Fd.\ -c $<
 
 DISSECTOR_OBJECTS = \
        $(ALL_DISSECTORS_SRC:.c=.obj)
@@ -39,7 +39,7 @@ dissectors.lib: register.obj packet-ncp2222.c $(GENERATED_HEADER_FILES) ../../co
     "$(MSVC_VARIANT)" != "MSVC2010EE"
 # Disable debug for large dissectors
 packet-rrc.obj : packet-rrc.c
-   $(CC) $(CVARSDLL) $(CFLAGS) /Zd /Fd.\ -c $?
+   $(CC) $(CFLAGS) /Zd /Fd.\ -c $?
 !ENDIF
 
 #

diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake
index 3e0e7e5171150354d84e105c97afec2fe796e1f3..647d8f8c23d1581756fc23e525feab599dd75fec 100644 (file)
--- a/epan/ftypes/Makefile.nmake
+++ b/epan/ftypes/Makefile.nmake
@@ -14,7 +14,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
        /I$(PCAP_DIR)\include
 
 .c.obj::
-   $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
+   $(CC) $(CFLAGS) -Fd.\ -c $<
 
 OBJECTS=$(NONGENERATED_C_FILES:.c=.obj)
 

diff --git a/epan/wslua/Makefile.nmake b/epan/wslua/Makefile.nmake
index d16232a36f4887a5db0cba2fafed238405a2028e..b7cf9de53272ed967d43eee7151f253a6d64ac6b 100644 (file)
--- a/epan/wslua/Makefile.nmake
+++ b/epan/wslua/Makefile.nmake
@@ -12,7 +12,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
        /I$(PCAP_DIR)\include
 
 .c.obj::
-   $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
+   $(CC) $(CFLAGS) -Fd.\ -c $<
 
 MODULES =      \
        lua_bitop.c \

diff --git a/epan/wspython/Makefile.nmake b/epan/wspython/Makefile.nmake
index 308d073616df104b447a6e3b908347fafb2bad42..a50ec26b3883ca0eea53c0f5fa9ea66ee9e3d9b5 100644 (file)
--- a/epan/wspython/Makefile.nmake
+++ b/epan/wspython/Makefile.nmake
@@ -12,7 +12,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
        $(PYTHON_CFLAGS)
 
 .c.obj::
-   $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
+   $(CC) $(CFLAGS) -Fd.\ -c $<
 
 LIBWSPYTHON_OBJECTS = $(LIBWSPYTHON_SRC:.c=.obj)
 

diff --git a/packaging/u3/tools/Makefile.nmake b/packaging/u3/tools/Makefile.nmake
index e7a0b77106f2416d4db2cade7342ec81cba107d6..a74dde4e639f263c683b342a68b045f5bb453929 100644 (file)
--- a/packaging/u3/tools/Makefile.nmake
+++ b/packaging/u3/tools/Makefile.nmake
@@ -17,7 +17,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 /ENTRY:mainCRTStartup $(LOCAL_LD
 CFLAGS=$(WARNINGS_ARE_ERRORS) -DHAVE_CONFIG_H $(LOCAL_CFLAGS) -I$(TOPDIR) $(GLIB_CFLAGS) $(GNUTLS_CFLAGS)
 
 .c.obj::
-       $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
+       $(CC) $(CFLAGS) -Fd.\ -c $<
 
 all:   utest.exe libgcrypt-11.dll libgpg-error-0.dll
 

diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake
index 1a5f4d296e9177eca87da10bf961ece643045030..5510bc57d293c3be153965baa0c55a49562f7f80 100644 (file)
--- a/plugins/mate/Makefile.nmake
+++ b/plugins/mate/Makefile.nmake
@@ -122,7 +122,7 @@ RUNLEX = ..\..\tools\runlex.sh
 
 mate_parser_lex.h : mate_parser.c
 mate_parser.obj : mate_parser.c
-       $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -c $?
+       $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $?
 
 mate_grammar.h : mate_grammar.c
 mate_grammar.c : mate_grammar.lemon $(LEMON)\lemon.exe

diff --git a/plugins/wimaxasncp/Makefile.nmake b/plugins/wimaxasncp/Makefile.nmake
index 60a1cd5a196596004a4760ade242b73806156657..36ea8784ebdebf66af1cff3f4ae124b47ddd9c9a 100644 (file)
--- a/plugins/wimaxasncp/Makefile.nmake
+++ b/plugins/wimaxasncp/Makefile.nmake
@@ -101,7 +101,7 @@ RUNLEX = ..\..\tools\runlex.sh
 
 wimaxasncp_dict_lex.h : wimaxasncp_dict.c
 wimaxasncp_dict.obj :   wimaxasncp_dict.c
-       $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -c $?
+       $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $?
 
 clean:
        rm -f $(OBJECTS) $(RESOURCE) plugin.c *.pdb *.sbr \

diff --git a/ui/Makefile.nmake b/ui/Makefile.nmake
index 124ebaca01903a3ddcfe4e716838e4273742397f..fd2ab05f7109669c54d478a83e9e715b45595d5d 100644 (file)
--- a/ui/Makefile.nmake
+++ b/ui/Makefile.nmake
@@ -22,7 +22,7 @@ GENERATED_CFLAGS=\
 CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
 
 .c.obj::
-       $(CC) $(CVARSDLL) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $<
+       $(CC) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $<
 
 include Makefile.common
 

diff --git a/ui/cli/Makefile.nmake b/ui/cli/Makefile.nmake
index fa0ddd794c2d7befa42c74bf3167e601cd71f507..12d81b079eac691957eecf19ff634dd0b1843939 100644 (file)
--- a/ui/cli/Makefile.nmake
+++ b/ui/cli/Makefile.nmake
@@ -22,7 +22,7 @@ GENERATED_CFLAGS=\
 CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
 
 .c.obj::
-       $(CC) $(CVARSDLL) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $<
+       $(CC) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $<
 
 include Makefile.common
 

diff --git a/ui/gtk/Makefile.nmake b/ui/gtk/Makefile.nmake
index 5503c8c9f57e69ca4c84fd93a2a2f4f1245c73fb..89c6ccdad2211a8083d74976a3ba906135cf5b1a 100644 (file)
--- a/ui/gtk/Makefile.nmake
+++ b/ui/gtk/Makefile.nmake
@@ -22,7 +22,7 @@ GENERATED_CFLAGS=\
 CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
 
 .c.obj::
-       $(CC) $(CVARSDLL) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $<
+       $(CC) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $<
 
 include Makefile.common
 
@@ -92,7 +92,7 @@ RUNLEX=..\..\tools\runlex.sh
 text_import_scanner.h: text_import_scanner.c
 text_import_scanner_lex.h: text_import_scanner.c
 text_import_scanner.obj : text_import_scanner.c
-       $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $?
+       $(CC) $(GENERATED_CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $?
 
 !IF "$(PORTAUDIO_VERSION)" == "18"
 pa_lib.obj: $(PORTAUDIO_DIR)\pa_common\pa_lib.c

diff --git a/ui/win32/Makefile.nmake b/ui/win32/Makefile.nmake
index b1c82cc78f50785cc97b52f9919ed03b6d0b25cd..6865a2aa8af4f6a589419cee3cb8b16ce46c84b1 100644 (file)
--- a/ui/win32/Makefile.nmake
+++ b/ui/win32/Makefile.nmake
@@ -16,7 +16,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
        /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS)
 
 .c.obj::
-       $(CC) $(CVARSDLL) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $<
+       $(CC) $(CFLAGS) $(WSUG_CFLAGS) -Fd.\ -c $<
 
 # if you add files here, be sure to include them also in Makefile.am EXTRA_DIST in the main Wireshark directory
 WIRESHARK_WIN32_SRC = \

diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index c5c032fdacd04ddf77e9af395a57d5069f3d6fb2..ca6d4b84060b782e078e528ec728918affb328e4 100644 (file)
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -18,7 +18,7 @@ GENERATED_CFLAGS=\
 CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
 
 .c.obj::
-       $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
+       $(CC) $(CFLAGS) -Fd.\ -c $<
 
 OBJECTS=$(NONGENERATED_C_FILES:.c=.obj) $(GENERATED_C_FILES:.c=.obj)
 
@@ -44,11 +44,11 @@ RUNLEX = ..\tools\runlex.sh
 
 ascend_scanner_lex.h : ascend_scanner.c
 ascend_scanner.obj : ascend_scanner.c ascend.h
-       $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -c ascend_scanner.c
+       $(CC) $(GENERATED_CFLAGS) -Fd.\ -c ascend_scanner.c
 
 k12text_lex.h : k12text.c
 k12text.obj : k12text.c
-       $(CC) $(CVARSDLL) $(GENERATED_CFLAGS) -Fd.\ -c $?
+       $(CC) $(GENERATED_CFLAGS) -Fd.\ -c $?
 
 ascend.c ascend.h : ascend.y
        $(YACC) $(YACC_OPTS) -d -p ascend ascend.y -o ascend.c

diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake
index 25c54f9ada3ec52d854e3166eb2d7054485ddfd8..ac99984a825ced8dd78ccfe690dec2040db0bb9a 100644 (file)
--- a/wsutil/Makefile.nmake
+++ b/wsutil/Makefile.nmake
@@ -16,7 +16,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \
        /I$(PCAP_DIR)\include
 
 .c.obj::
-   $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
+   $(CC) $(CFLAGS) -Fd.\ -c $<
 
 # For use when making libwsutil.dll
 libwsutil_LIBS = $(GLIB_LIBS)