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

svn path=/trunk/; revision=41180

6 files changed, 13 insertions, 13 deletions

diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index fe3b3f8094..4ed1df8fa0 100644
--- 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 36bd3938a4..97b8ba6739 100644
--- 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 59d1a6ed8e..3e6a1d9c2a 100644
--- 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 3e0e7e5171..647d8f8c23 100644
--- 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 d16232a36f..b7cf9de532 100644
--- 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 308d073616..a50ec26b38 100644
--- 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)