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

From Andrew Feren: add ifdefs to the top-level Makefile.nmake to avoid 

using Python if PYTHON isn't defined.

Fix up white space.

svn path=/trunk/; revision=4837
This commit is contained in:
Guy Harris 2002-03-01 06:52:14 +00:00
parent 00c17fb92b
commit 56be333a81
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -910,6 +910,8 @@ Shinsuke Suzuki <suz[AT]kame.net> {
Andrew C. Feren <aferen[AT]cetacean.com> {
Makefile fix
Solaris packaging fixes
Add ifdefs to the top-level Makefile.nmake to avoid using
Python if PYTHON isn't defined
}
Tomas Kukosa <tomas.kukosa[AT]anfdata.cz> {

22
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.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