forked from osmocom/wireshark
From Laurent Rabret: replace "lib" with "link /lib"; "lib" is just a
wrapper around "link /lib", and not all Microsoft C compiler distributions provide "lib". svn path=/trunk/; revision=11242
This commit is contained in:
parent
10eacc1f0a
commit
7737b1382d
|
@ -1,7 +1,7 @@
|
||||||
## Makefile for building ethereal.exe with Microsoft C and nmake
|
## Makefile for building ethereal.exe with Microsoft C and nmake
|
||||||
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
|
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
|
||||||
#
|
#
|
||||||
# $Id: Makefile.nmake,v 1.424 2004/06/21 17:27:35 ulfl Exp $
|
# $Id: Makefile.nmake,v 1.425 2004/06/26 02:16:15 guy Exp $
|
||||||
|
|
||||||
include config.nmake
|
include config.nmake
|
||||||
include <win32.mak>
|
include <win32.mak>
|
||||||
|
@ -196,7 +196,7 @@ randpkt.exe : $(randpkt_OBJECTS) $(EXTRA_OBJECTS)
|
||||||
<<
|
<<
|
||||||
|
|
||||||
dissectors.lib: config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS)
|
dissectors.lib: config.h $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS)
|
||||||
lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS)
|
link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) $(EXTRA_OBJECTS)
|
||||||
|
|
||||||
config.h : config.h.win32 config.nmake
|
config.h : config.h.win32 config.nmake
|
||||||
sed -e s/@VERSION@/$(VERSION)/ \
|
sed -e s/@VERSION@/$(VERSION)/ \
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
## Makefile for building ethereal.exe with Microsoft C and nmake
|
## Makefile for building ethereal.exe with Microsoft C and nmake
|
||||||
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
|
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
|
||||||
#
|
#
|
||||||
# $Id: Makefile.nmake,v 1.44 2004/06/25 07:10:54 jmayer Exp $
|
# $Id: Makefile.nmake,v 1.45 2004/06/26 02:16:15 guy Exp $
|
||||||
|
|
||||||
include ..\config.nmake
|
include ..\config.nmake
|
||||||
include <win32.mak>
|
include <win32.mak>
|
||||||
|
@ -76,7 +76,7 @@ libethereal.dll: ..\config.h $(OBJECTS) libethereal.def ftypes dfilter doxygen
|
||||||
|
|
||||||
|
|
||||||
ethereal.lib : ..\config.h $(OBJECTS)
|
ethereal.lib : ..\config.h $(OBJECTS)
|
||||||
lib /out:ethereal.lib $(OBJECTS)
|
link /lib /out:ethereal.lib $(OBJECTS)
|
||||||
|
|
||||||
..\config.h : ..\config.h.win32 ..\config.nmake
|
..\config.h : ..\config.h.win32 ..\config.nmake
|
||||||
cd ..
|
cd ..
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
## Makefile for building ethereal.exe with Microsoft C and nmake
|
## Makefile for building ethereal.exe with Microsoft C and nmake
|
||||||
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
|
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
|
||||||
#
|
#
|
||||||
# $Id: Makefile.nmake,v 1.13 2004/05/06 20:48:36 obiot Exp $
|
# $Id: Makefile.nmake,v 1.14 2004/06/26 02:16:16 guy Exp $
|
||||||
|
|
||||||
include ..\..\config.nmake
|
include ..\..\config.nmake
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ OBJECTS = \
|
||||||
syntax-tree.obj
|
syntax-tree.obj
|
||||||
|
|
||||||
dfilter.lib : $(OBJECTS)
|
dfilter.lib : $(OBJECTS)
|
||||||
lib /out:dfilter.lib $(OBJECTS)
|
link /lib /out:dfilter.lib $(OBJECTS)
|
||||||
|
|
||||||
$(OBJECTS): ..\..\config.h
|
$(OBJECTS): ..\..\config.h
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
## Makefile for building ethereal.exe with Microsoft C and nmake
|
## Makefile for building ethereal.exe with Microsoft C and nmake
|
||||||
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
|
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
|
||||||
#
|
#
|
||||||
# $Id: Makefile.nmake,v 1.9 2004/01/22 19:27:59 ulfl Exp $
|
# $Id: Makefile.nmake,v 1.10 2004/06/26 02:16:16 guy Exp $
|
||||||
|
|
||||||
include ..\..\config.nmake
|
include ..\..\config.nmake
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ OBJECTS = \
|
||||||
|
|
||||||
|
|
||||||
ftypes.lib : $(OBJECTS)
|
ftypes.lib : $(OBJECTS)
|
||||||
lib /out:ftypes.lib $(OBJECTS)
|
link /lib /out:ftypes.lib $(OBJECTS)
|
||||||
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
## Makefile for building ethereal.exe with Microsoft C and nmake
|
## Makefile for building ethereal.exe with Microsoft C and nmake
|
||||||
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
|
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
|
||||||
#
|
#
|
||||||
# $Id: Makefile.nmake,v 1.77 2004/06/25 07:10:54 jmayer Exp $
|
# $Id: Makefile.nmake,v 1.78 2004/06/26 02:16:16 guy Exp $
|
||||||
|
|
||||||
include ..\config.nmake
|
include ..\config.nmake
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ ETHEREAL_WIN32_GTK_OBJECTS = $(ETHEREAL_WIN32_GTK_SRC:.c=.obj)
|
||||||
|
|
||||||
|
|
||||||
libui.lib : ..\config.h $(ETHEREAL_WIN32_GTK_OBJECTS) $(ETHEREAL_TAP_OBJECTS)
|
libui.lib : ..\config.h $(ETHEREAL_WIN32_GTK_OBJECTS) $(ETHEREAL_TAP_OBJECTS)
|
||||||
lib /out:libui.lib $(ETHEREAL_WIN32_GTK_OBJECTS) $(ETHEREAL_TAP_OBJECTS)
|
link /lib /out:libui.lib $(ETHEREAL_WIN32_GTK_OBJECTS) $(ETHEREAL_TAP_OBJECTS)
|
||||||
|
|
||||||
ethereal-tap-register.c: $(ETHEREAL_TAP_SRC) ../make-tapreg-dotc Makefile.common
|
ethereal-tap-register.c: $(ETHEREAL_TAP_SRC) ../make-tapreg-dotc Makefile.common
|
||||||
@echo Making ethereal-tap-register.c
|
@echo Making ethereal-tap-register.c
|
||||||
|
|
Loading…
Reference in New Issue