diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-06-12 09:45:42 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-06-12 09:45:42 +0000 |
| commit | ec5499613d54fcec1c5ab43134df2a404e1154d1 (patch) | |
| tree | 4a8fa88d80ad694f7453d60facafdba5a1be1f74 /epan/Makefile.nmake | |
| parent | ee97ce31966f61de148ad85cb229e76a88801b02 (diff) | |
| download | wireshark-ec5499613d54fcec1c5ab43134df2a404e1154d1.tar.gz | |
Don't wire into "config.h.win32" files an indication of whether we have
GNU ADNS or not - set it based on whether ADNS_DIR is defined by
"config.nmake", and make "config.h.win32" files that specify whether we
have GNU ADNS dependent on "config.nmake".
Note in "config.nmake" that:
if you have GNU ADNS, ADNS_DIR should be defined as the
directory in which the ADNS .lib file resides;
if you don't have GNU ADNS, ADNS_DIR shouldn't be defined.
svn path=/trunk/; revision=7860
Diffstat (limited to 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 47c6f8e395..28186e967f 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -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.24 2003/06/02 18:40:01 gerald Exp $ +# $Id: Makefile.nmake,v 1.25 2003/06/12 09:45:42 guy Exp $ include ..\config.nmake @@ -59,8 +59,12 @@ all: ftypes dfilter ethereal.lib ethereal.lib : config.h $(OBJECTS) lib /out:ethereal.lib $(OBJECTS) -config.h : config.h.win32 - sed -e s/@VERSION@/$(VERSION)/ < config.h.win32 > $@ +config.h : config.h.win32 ..\config.nmake +!IFDEF ADNS_DIR + sed -e s/@VERSION@/$(VERSION)/ -e "s;@HAVE_GNU_ADNS@;#define HAVE_GNU_ADNS 1;" < config.h.win32 > $@ +!ELSE + sed -e s/@VERSION@/$(VERSION)/ -e "s;@HAVE_GNU_ADNS@;/* #undef HAVE_GNU_ADNS */;" < config.h.win32 > $@ +!ENDIF clean: rm -f $(OBJECTS) ethereal.lib config.h $(PDB_FILE) |