diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-03-01 06:52:14 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-03-01 06:52:14 +0000 |
| commit | bfe2a8844d1e18d83e5f59723541fb8522df9dd9 (patch) | |
| tree | 1a113ea4d567c6ae23cdf9f297e63ad526f36353 /Makefile.nmake | |
| parent | b94eff069fc675c70675e24d961bc62cd21a2792 (diff) | |
From Andrew Feren: add ifdefs to the top-level Makefile.nmake to avoid
using Python if PYTHON isn't defined.
Fix up white space.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4837 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 2455b94a03..93bcfe7b0c 100644 --- a/Makefile.nmake +++ b/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.172 2002/02/27 09:42:38 guy Exp $ +# $Id: Makefile.nmake,v 1.173 2002/03/01 06:52:14 guy Exp $ include config.nmake include <win32.mak> @@ -336,7 +336,7 @@ mergecap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib epan\ethereal.lib \ epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \ wsock32.lib user32.lib \ - wiretap\wiretap-$(WTAP_VERSION).lib \ + wiretap\wiretap-$(WTAP_VERSION).lib \ $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \ $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib @@ -404,15 +404,25 @@ x11-declarations.h x11-register-info.h: x11-fields process-x11-fields.pl $(PERL) process-x11-fields.pl <x11-fields packet-ncp2222.c : ncp2222.py +!IFDEF PYTHON @echo Making packet-ncp2222.c $(PYTHON) ncp2222.py > packet-ncp2222.c +!ELSE + @echo Faking packet-ncp2222.c... + @echo Python is required to build the NCP disector + @echo Hiding packet-ncp.c... + mv packet-ncp.c packet-ncp.c.save + touch packet-ncp.c $@ +!ENDIF register.c: $(DISSECTOR_SRC) - @echo Making register.c +!IFDEF PYTHON + @echo Making register.c (using python) @$(PYTHON) make-reg-dotc.py . $(DISSECTOR_SRC) -# How are ifdef's done in NMAKE? It would be nice -# to use python if PYTHON is defined, otherwise try to use shell. -# @sh make-reg-dotc . $(DISSECTOR_SRC) +!ELSE + @echo Making register.c (using sh) + @sh make-reg-dotc register.c $(DISSECTOR_SRC) +!ENDIF text2pcap-scanner.c : text2pcap-scanner.l $(LEX) -otext2pcap-scanner.c text2pcap-scanner.l |