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

Get rid of epan/config.h.win32. 

Fix a missing ZLIB_CFLAGS in epan/Makefile.nmake.

svn path=/trunk/; revision=10807
This commit is contained in:
Olivier Biot 2004-05-06 20:48:36 +00:00
parent 77449b1085
commit 388aaadcb7
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.nmake
View File

@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
# $Id: Makefile.nmake,v 1.415 2004/04/23 05:19:49 guy Exp $
# $Id: Makefile.nmake,v 1.416 2004/05/06 20:48:35 obiot Exp $
include config.nmake
include <win32.mak>
@ -103,7 +103,7 @@ EXECUTABLES=ethereal.exe ethereal-gtk2.exe tethereal.exe editcap.exe mergecap.ex
RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res image\mergecap.res image\text2pcap.res
all: tools wiretap epan image $(EXECUTABLES) $(RESOURCES) doc
all: config.h tools wiretap epan image $(EXECUTABLES) $(RESOURCES) doc
packaging: all
cd packaging

4
config.h.win32
View File

@ -1,4 +1,4 @@
/* $Id: config.h.win32,v 1.43 2003/12/07 00:04:31 gerald Exp $ */
/* $Id: config.h.win32,v 1.44 2004/05/06 20:48:35 obiot Exp $ */
/* config.h.win32 Generated manually. :-) */
/* config.h. Generated automatically by configure. */
/* config.h.in. Generated automatically from configure.in by autoheader. */
@ -28,7 +28,7 @@
/* #undef WORDS_BIGENDIAN */
/* Define if lex declares yytext as a char * by default, not a char[]. */
/* #undef YYTEXT_POINTER */
#define YYTEXT_POINTER 1
#define HAVE_PLUGINS 1
#define PLUGINS_NEED_ADDRESS_TABLE 1

21
epan/Makefile.nmake
View File

@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
# $Id: Makefile.nmake,v 1.38 2004/03/22 20:35:07 gerald Exp $
# $Id: Makefile.nmake,v 1.39 2004/05/06 20:48:36 obiot Exp $
include ..\config.nmake
include Makefile.common
@ -9,7 +9,7 @@ include Makefile.common
############### no need to modify below this line #########
CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GLIB_CFLAGS) \
$(ADNS_CFLAGS) $(PCRE_CFLAGS) /I$(PCAP_DIR)\include \
$(ZLIB_CFLAGS) $(ADNS_CFLAGS) $(PCRE_CFLAGS) /I$(PCAP_DIR)\include \
-D_U_="" $(LOCAL_CFLAGS)
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
@ -54,17 +54,16 @@ OBJECTS=addr_and_mask.obj \
all: ftypes dfilter ethereal.lib
# For use when making ethereal.dll
#ethereal.dll ethereal.lib : config.h $(OBJECTS)
#ethereal.dll ethereal.lib : ..\config.h $(OBJECTS)
# link /DLL /out:ethereal.dll $(OBJECTS) $(libethereal_LIBS)
ethereal.lib : config.h $(OBJECTS)
ethereal.lib : ..\config.h $(OBJECTS)
lib /out:ethereal.lib $(OBJECTS)
config.h : config.h.win32 ..\config.nmake
sed -e s/@VERSION@/$(VERSION)/ \
-e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" \
-e "s/@HAVE_PCRE@/$(PCRE_CONFIG)/" \
< config.h.win32 > $@
..\config.h : ..\config.h.win32 ..\config.nmake
cd ..
$(MAKE) -f Makefile.nmake config.h
cd epan
clean:
rm -f $(OBJECTS) ethereal.lib $(PDB_FILE)
@ -82,12 +81,12 @@ distclean: clean
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ..
ftypes:: config.h
ftypes:: ..\config.h
cd ftypes
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
cd ..
dfilter:: config.h
dfilter:: ..\config.h
cd dfilter
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
cd ..

12
epan/dfilter/Makefile.nmake
View File

@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
# $Id: Makefile.nmake,v 1.12 2004/01/22 19:27:59 ulfl Exp $
# $Id: Makefile.nmake,v 1.13 2004/05/06 20:48:36 obiot Exp $
include ..\..\config.nmake
@ -37,12 +37,12 @@ OBJECTS = \
dfilter.lib : $(OBJECTS)
lib /out:dfilter.lib $(OBJECTS)
$(OBJECTS): ..\config.h
$(OBJECTS): ..\..\config.h
..\config.h:
cd ..
$(MAKE) -f makefile.nmake config.h
cd dfilter
..\..\config.h: ..\..\config.h.win32 ..\..\config.nmake
cd ..\..
$(MAKE) -f Makefile.nmake config.h
cd epan\dfilter
clean:
rm -f $(OBJECTS) dfilter.lib $(PDB_FILE)