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

Build reassembly_test.c *without* -DWS_BUILD_DLL, as it's not part of 

the library, it's a test program that links with the library and imports
stuff from the library.

svn path=/trunk/; revision=48514
This commit is contained in:
Guy Harris 2013-03-23 21:02:39 +00:00
parent 4af1baba7a
commit 31a61c521f
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
epan/Makefile.nmake
View File

@ -11,16 +11,39 @@ include Makefile.common
LINK= link
# We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output
GENERATED_CFLAGS=\
#
# These are the flags for all source files.
#
COMMON_CFLAGS=\
$(STANDARD_CFLAGS) \
/I. /I.. /I../wiretap $(GLIB_CFLAGS) \
$(ZLIB_CFLAGS) $(C_ARES_CFLAGS) $(ADNS_CFLAGS) \
$(LUA_CFLAGS) $(GNUTLS_CFLAGS) /I$(PCAP_DIR)\include \
$(PYTHON_CFLAGS) $(SMI_CFLAGS) $(GEOIP_CFLAGS) \
-DWS_BUILD_DLL
$(PYTHON_CFLAGS) $(SMI_CFLAGS) $(GEOIP_CFLAGS)
CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS)
#
# These are the flags for generated source files; we don't include
# $(WARNINGS_ARE_ERRORS), so that we flex's non-LLP64-compliant output
# doesn't cause compilation to fail.
#
GENERATED_CFLAGS=\
$(COMMON_CFLAGS) -DWS_BUILD_DLL
#
# These are the flags for test programs; we don't include -DWS_BUILD_DLL,
# as we're building test programs that link with the library, not routines
# incorporated into the library, so they should *import* stuff from the
# library, not *export* stuff from the library.
#
TEST_CFLAGS=\
$(WARNINGS_ARE_ERRORS) $(COMMON_CFLAGS)
#
# These are flags for everything else; we include $(WARNINGS_ARE_ERRORS),
# as the code should be warning-free, and we include -DWS_BUILD_DLL,
# as these are library routines, not test programs.
#
CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) -DWS_BUILD_DLL
!IFDEF LUA_DIR
WSLUA_LIB=wslua\wslua.lib
@ -358,5 +381,13 @@ dtd_grammar.h: dtd_grammar.c
dtd_grammar.c: $(LEMON)\lemon.exe $(LEMON)\lempar.c dtd_grammar.lemon
$(LEMON)\lemon t=$(LEMON)\lempar.c dtd_grammar.lemon
#
# We compile these specially because they're test programs, not library
# routines, and thus they import stuff from the library rather than
# exporting stuff from the library.
#
reassemble_test.obj: reassemble_test.c
$(CC) $(TEST_CFLAGS) -Fd.\ -c $?
checkapi:
$(PERL) ../tools/checkAPIs.pl -g termoutput -build $(LIBWIRESHARK_SRC)