osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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

svn path=/trunk/; revision=41180
This commit is contained in:
Bill Meier 2012-02-24 16:23:38 +00:00
parent cacbe31797
commit 605dea0486
15 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/Makefile.nmake
View File

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

4
epan/dfilter/Makefile.nmake
View File

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

4
epan/dissectors/Makefile.nmake
View File

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

2
epan/ftypes/Makefile.nmake
View File

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

2
epan/wslua/Makefile.nmake
View File

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

2
epan/wspython/Makefile.nmake
View File

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

2
packaging/u3/tools/Makefile.nmake
View File

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

2
plugins/mate/Makefile.nmake
View File

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

2
plugins/wimaxasncp/Makefile.nmake
View File

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

2
ui/Makefile.nmake
View File

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

2
ui/cli/Makefile.nmake
View File

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

4
ui/gtk/Makefile.nmake
View File

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

2
ui/win32/Makefile.nmake
View File

@ -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 = \

6
wiretap/Makefile.nmake
View File

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

2
wsutil/Makefile.nmake
View File

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