osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Do all the tests for whether ADNS_DIR is defined or not in 

"config.nmake", and just use the variables set based on the results of
those tests in various "Makefile.nmake" files.

svn path=/trunk/; revision=7891
This commit is contained in:
Guy Harris 2003-06-15 23:04:47 +00:00
parent c88189af06
commit 0bdb498bdb
3 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
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.310 2003/06/14 20:45:23 guy Exp $
# $Id: Makefile.nmake,v 1.311 2003/06/15 23:04:46 guy Exp $
include config.nmake
include <win32.mak>
@ -16,8 +16,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GTK_CFLAGS) /I. /Iwiretap \
/I$(ZLIB_DIR) /I$(PCAP_DIR)\include \
/I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32 \
/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32 \
-D_U_=""
$(ADNS_CFLAGS) -D_U_=""
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
@ -450,9 +449,7 @@ ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
wsock32.lib user32.lib \
$(GTK_LIBS) \
!IFDEF ADNS_DIR
$(ADNS_DIR)\adns_win32\lib\adns_dll.lib \
!ENDIF
$(ADNS_LIBS) \
$(NET_SNMP_DIR)\win32\lib\libsnmp.lib
# $(PCAP_DIR)\lib\wpcap.lib
@ -461,9 +458,7 @@ tethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
wsock32.lib user32.lib \
$(GLIB_LIBS) \
!IFDEF ADNS_DIR
$(ADNS_DIR)\adns_win32\lib\adns_dll.lib \
!ENDIF
$(ADNS_LIBS) \
$(NET_SNMP_DIR)\win32\lib\libsnmp.lib
editcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
@ -536,11 +531,7 @@ randpkt.exe : $(randpkt_OBJECTS) $(EXTRA_OBJECTS)
<<
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
sed -e s/@VERSION@/$(VERSION)/ -e "s;@HAVE_GNU_ADNS@;$(ADNS_CONFIG);" < config.h.win32 > $@
ps.c : rdps.exe print.ps
rdps print.ps ps.c

12
config.nmake
View File

@ -1,4 +1,4 @@
# $Id: config.nmake,v 1.46 2003/06/15 22:58:19 guy Exp $
# $Id: config.nmake,v 1.47 2003/06/15 23:04:47 guy Exp $
VERSION=0.9.13
#
@ -105,3 +105,13 @@ GTK_LIBS=$(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \
$(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \
$(GLIB_LIBS)
!ENDIF
!IFDEF ADNS_DIR
ADNS_CFLAGS=/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32
ADNS_LIBS=$(ADNS_DIR)\adns_win32\lib\adns_dll.lib
ADNS_CONFIG="#define HAVE_GNU_ADNS 1"
!else
ADNS_CFLAGS=
ADNS_LIBS=
ADNS_CONFIG="/* #undef HAVE_GNU_ADNS */"
!ENDIF

13
epan/Makefile.nmake
View File

@ -1,17 +1,14 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
# $Id: Makefile.nmake,v 1.28 2003/06/14 20:45:24 guy Exp $
# $Id: Makefile.nmake,v 1.29 2003/06/15 23:04:47 guy Exp $
include ..\config.nmake
############### no need to modify below this line #########
CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GTK_CFLAGS) \
!IFDEF ADNS_DIR
/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32 \
!ENDIF
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
$(ADNS_CFLAGS) /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
@ -59,11 +56,7 @@ ethereal.lib : config.h $(OBJECTS)
lib /out:ethereal.lib $(OBJECTS)
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
sed -e s/@VERSION@/$(VERSION)/ -e "s;@HAVE_GNU_ADNS@;$(ADNS_CONFIG);" < config.h.win32 > $@
clean:
rm -f $(OBJECTS) ethereal.lib config.h $(PDB_FILE)