diff options
| author | Olivier Biot <obiot.ethereal@gmail.com> | 2004-05-06 20:48:36 +0000 |
|---|---|---|
| committer | Olivier Biot <obiot.ethereal@gmail.com> | 2004-05-06 20:48:36 +0000 |
| commit | 388aaadcb79b2cf20a84e5a8e6ca667d978e7766 (patch) | |
| tree | ee016cb73972208ec742324de7612146d143522e /epan | |
| parent | 77449b1085568d8d79da09040f6e8ff8ba007a00 (diff) | |
Get rid of epan/config.h.win32.
Fix a missing ZLIB_CFLAGS in epan/Makefile.nmake.
svn path=/trunk/; revision=10807
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/Makefile.nmake | 21 | ||||
| -rw-r--r-- | epan/dfilter/Makefile.nmake | 12 |
2 files changed, 16 insertions, 17 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index a66d0aea37..648dffa602 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.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 .. diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake index 3c5474e7b6..7581de5f8b 100644 --- a/epan/dfilter/Makefile.nmake +++ b/epan/dfilter/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.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) |