Define GLIB_LIBS and GTK_LIBS variables in config.nmake (based on
variables the user configures - the user isn't expected to change GLIB_LIBS or GTK_LIBS, and there's a comment nothing that users shouldn't have to do so), which contain the appropriate libraries for building stuff that requires only GLib, and stuff that required GTK+ and GLib, respectively, and use those macros in the Makefile.nmake files. svn path=/trunk/; revision=7885
This commit is contained in:
parent
71424053cd
commit
8178db4980
|
@ -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.309 2003/06/14 20:35:55 guy Exp $
|
# $Id: Makefile.nmake,v 1.310 2003/06/14 20:45:23 guy Exp $
|
||||||
|
|
||||||
include config.nmake
|
include config.nmake
|
||||||
include <win32.mak>
|
include <win32.mak>
|
||||||
|
@ -449,10 +449,7 @@ ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
|
||||||
gtk\libui.lib epan\ethereal.lib \
|
gtk\libui.lib epan\ethereal.lib \
|
||||||
epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
|
epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
|
||||||
wsock32.lib user32.lib \
|
wsock32.lib user32.lib \
|
||||||
$(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \
|
$(GTK_LIBS) \
|
||||||
$(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \
|
|
||||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
|
|
||||||
$(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \
|
|
||||||
!IFDEF ADNS_DIR
|
!IFDEF ADNS_DIR
|
||||||
$(ADNS_DIR)\adns_win32\lib\adns_dll.lib \
|
$(ADNS_DIR)\adns_win32\lib\adns_dll.lib \
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
@ -463,8 +460,7 @@ tethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
|
||||||
epan\ethereal.lib \
|
epan\ethereal.lib \
|
||||||
epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
|
epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
|
||||||
wsock32.lib user32.lib \
|
wsock32.lib user32.lib \
|
||||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
|
$(GLIB_LIBS) \
|
||||||
$(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \
|
|
||||||
!IFDEF ADNS_DIR
|
!IFDEF ADNS_DIR
|
||||||
$(ADNS_DIR)\adns_win32\lib\adns_dll.lib \
|
$(ADNS_DIR)\adns_win32\lib\adns_dll.lib \
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
@ -472,24 +468,21 @@ tethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
|
||||||
|
|
||||||
editcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
|
editcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
|
||||||
wsock32.lib user32.lib \
|
wsock32.lib user32.lib \
|
||||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
|
$(GLIB_LIBS)
|
||||||
$(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
|
|
||||||
|
|
||||||
mergecap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
|
mergecap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
|
||||||
wsock32.lib user32.lib \
|
wsock32.lib user32.lib \
|
||||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
|
$(GLIB_LIBS)
|
||||||
$(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
|
|
||||||
|
|
||||||
dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib epan\ethereal.lib \
|
dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib epan\ethereal.lib \
|
||||||
epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
|
epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
|
||||||
wsock32.lib user32.lib \
|
wsock32.lib user32.lib \
|
||||||
wiretap\wiretap-$(WTAP_VERSION).lib \
|
wiretap\wiretap-$(WTAP_VERSION).lib \
|
||||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
|
$(GLIB_LIBS)
|
||||||
$(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
|
|
||||||
|
|
||||||
randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
|
randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
|
||||||
user32.lib \
|
user32.lib \
|
||||||
$(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \
|
$(GLIB_LIBS) \
|
||||||
$(NET_SNMP_DIR)\win32\lib\libsnmp.lib
|
$(NET_SNMP_DIR)\win32\lib\libsnmp.lib
|
||||||
|
|
||||||
EXECUTABLES=ethereal.exe tethereal.exe editcap.exe mergecap.exe text2pcap.exe
|
EXECUTABLES=ethereal.exe tethereal.exe editcap.exe mergecap.exe text2pcap.exe
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# $Id: config.nmake,v 1.44 2003/06/14 20:35:55 guy Exp $
|
# $Id: config.nmake,v 1.45 2003/06/14 20:45:23 guy Exp $
|
||||||
|
|
||||||
VERSION=0.9.13
|
VERSION=0.9.13
|
||||||
#
|
#
|
||||||
|
@ -69,3 +69,8 @@ MAKENSIS="C:/program files/nsis/makensis.exe"
|
||||||
#
|
#
|
||||||
GLIB_CFLAGS=/I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule
|
GLIB_CFLAGS=/I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule
|
||||||
GTK_CFLAGS=/I$(GTK_DIR) /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 $(GLIB_CFLAGS)
|
GTK_CFLAGS=/I$(GTK_DIR) /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 $(GLIB_CFLAGS)
|
||||||
|
GLIB_LIBS=$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
|
||||||
|
$(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
|
||||||
|
GTK_LIBS=$(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \
|
||||||
|
$(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \
|
||||||
|
$(GLIB_LIBS)
|
||||||
|
|
|
@ -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.27 2003/06/14 20:35:56 guy Exp $
|
# $Id: Makefile.nmake,v 1.28 2003/06/14 20:45:24 guy Exp $
|
||||||
|
|
||||||
include ..\config.nmake
|
include ..\config.nmake
|
||||||
|
|
||||||
|
@ -18,8 +18,7 @@ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
|
||||||
# For use when making ethereal.dll
|
# For use when making ethereal.dll
|
||||||
libethereal_LIBS = \
|
libethereal_LIBS = \
|
||||||
wsock32.lib user32.lib \
|
wsock32.lib user32.lib \
|
||||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
|
$(GLIB_LIBS)
|
||||||
$(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
|
|
||||||
|
|
||||||
.c.obj::
|
.c.obj::
|
||||||
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
|
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# $Id: Makefile.nmake,v 1.2 2003/06/14 20:35:59 guy Exp $
|
# $Id: Makefile.nmake,v 1.3 2003/06/14 20:45:24 guy Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
include ..\..\config.nmake
|
include ..\..\config.nmake
|
||||||
|
@ -13,7 +13,7 @@ OBJECTS=packet-artnet.obj
|
||||||
|
|
||||||
artnet.dll artnet.exp artnet.lib : packet-artnet.obj ..\plugin_api.obj
|
artnet.dll artnet.exp artnet.lib : packet-artnet.obj ..\plugin_api.obj
|
||||||
link -dll /out:artnet.dll packet-artnet.obj ..\plugin_api.obj \
|
link -dll /out:artnet.dll packet-artnet.obj ..\plugin_api.obj \
|
||||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib
|
$(GLIB_LIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJECTS) artnet.dll artnet.exp artnet.lib $(PDB_FILE)
|
rm -f $(OBJECTS) artnet.dll artnet.exp artnet.lib $(PDB_FILE)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# $Id: Makefile.nmake,v 1.4 2003/06/14 20:35:59 guy Exp $
|
# $Id: Makefile.nmake,v 1.5 2003/06/14 20:45:24 guy Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
include ..\..\config.nmake
|
include ..\..\config.nmake
|
||||||
|
@ -36,7 +36,7 @@ docsis.dll docsis.exp docsis.lib : packet-docsis.obj packet-bpkmattr.obj packet-
|
||||||
packet-ucd.obj packet-dsareq.obj \
|
packet-ucd.obj packet-dsareq.obj \
|
||||||
packet-dsdrsp.obj packet-rngreq.obj \
|
packet-dsdrsp.obj packet-rngreq.obj \
|
||||||
packet-vendor.obj ..\plugin_api.obj \
|
packet-vendor.obj ..\plugin_api.obj \
|
||||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib
|
$(GLIB_LIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJECTS) docsis.dll docsis.exp docsis.lib $(PDB_FILE)
|
rm -f $(OBJECTS) docsis.dll docsis.exp docsis.lib $(PDB_FILE)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# $Id: Makefile.nmake,v 1.7 2003/06/14 20:36:01 guy Exp $
|
# $Id: Makefile.nmake,v 1.8 2003/06/14 20:45:25 guy Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
include ..\..\config.nmake
|
include ..\..\config.nmake
|
||||||
|
@ -15,12 +15,11 @@ all : cosnaming.dll coseventcomm.dll
|
||||||
|
|
||||||
cosnaming.dll cosnaming.exp cosnaming.lib : packet-cosnaming.obj ..\plugin_api.obj
|
cosnaming.dll cosnaming.exp cosnaming.lib : packet-cosnaming.obj ..\plugin_api.obj
|
||||||
link -dll /out:cosnaming.dll packet-cosnaming.obj ..\plugin_api.obj \
|
link -dll /out:cosnaming.dll packet-cosnaming.obj ..\plugin_api.obj \
|
||||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib
|
$(GLIB_LIBS)
|
||||||
|
|
||||||
coseventcomm.dll coseventcomm.exp coseventcomm.lib : packet-coseventcomm.obj ..\plugin_api.obj
|
coseventcomm.dll coseventcomm.exp coseventcomm.lib : packet-coseventcomm.obj ..\plugin_api.obj
|
||||||
link -dll /out:coseventcomm.dll packet-coseventcomm.obj ..\plugin_api.obj \
|
link -dll /out:coseventcomm.dll packet-coseventcomm.obj ..\plugin_api.obj \
|
||||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib
|
$(GLIB_LIBS)
|
||||||
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJECTS) cosnaming.dll cosnaming.exp cosnaming.lib \
|
rm -f $(OBJECTS) cosnaming.dll cosnaming.exp cosnaming.lib \
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# $Id: Makefile.nmake,v 1.10 2003/06/14 20:36:01 guy Exp $
|
# $Id: Makefile.nmake,v 1.11 2003/06/14 20:45:25 guy Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
include ..\..\config.nmake
|
include ..\..\config.nmake
|
||||||
|
@ -13,7 +13,7 @@ OBJECTS=packet-gryphon.obj
|
||||||
|
|
||||||
gryphon.dll gryphon.exp gryphon.lib : packet-gryphon.obj ..\plugin_api.obj
|
gryphon.dll gryphon.exp gryphon.lib : packet-gryphon.obj ..\plugin_api.obj
|
||||||
link -dll /out:gryphon.dll packet-gryphon.obj ..\plugin_api.obj \
|
link -dll /out:gryphon.dll packet-gryphon.obj ..\plugin_api.obj \
|
||||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib
|
$(GLIB_LIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJECTS) gryphon.dll gryphon.exp gryphon.lib $(PDB_FILE)
|
rm -f $(OBJECTS) gryphon.dll gryphon.exp gryphon.lib $(PDB_FILE)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# $Id: Makefile.nmake,v 1.2 2003/06/14 20:36:02 guy Exp $
|
# $Id: Makefile.nmake,v 1.3 2003/06/14 20:45:26 guy Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
include ..\..\config.nmake
|
include ..\..\config.nmake
|
||||||
|
@ -13,7 +13,7 @@ OBJECTS=packet-megaco.obj
|
||||||
|
|
||||||
megaco.dll megaco.exp megaco.lib : packet-megaco.obj ..\plugin_api.obj
|
megaco.dll megaco.exp megaco.lib : packet-megaco.obj ..\plugin_api.obj
|
||||||
link -dll /out:megaco.dll packet-megaco.obj ..\plugin_api.obj \
|
link -dll /out:megaco.dll packet-megaco.obj ..\plugin_api.obj \
|
||||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib
|
$(GLIB_LIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJECTS) megaco.dll megaco.exp megaco.lib $(PDB_FILE)
|
rm -f $(OBJECTS) megaco.dll megaco.exp megaco.lib $(PDB_FILE)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# $Id: Makefile.nmake,v 1.6 2003/06/14 20:36:03 guy Exp $
|
# $Id: Makefile.nmake,v 1.7 2003/06/14 20:45:27 guy Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
include ..\..\config.nmake
|
include ..\..\config.nmake
|
||||||
|
@ -13,7 +13,7 @@ OBJECTS=packet-mgcp.obj
|
||||||
|
|
||||||
mgcp.dll mgcp.exp mgcp.lib : packet-mgcp.obj ..\plugin_api.obj
|
mgcp.dll mgcp.exp mgcp.lib : packet-mgcp.obj ..\plugin_api.obj
|
||||||
link -dll /out:mgcp.dll packet-mgcp.obj ..\plugin_api.obj \
|
link -dll /out:mgcp.dll packet-mgcp.obj ..\plugin_api.obj \
|
||||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib
|
$(GLIB_LIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJECTS) mgcp.dll mgcp.exp mgcp.lib $(PDB_FILE)
|
rm -f $(OBJECTS) mgcp.dll mgcp.exp mgcp.lib $(PDB_FILE)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# $Id: Makefile.nmake,v 1.2 2003/06/14 20:36:03 guy Exp $
|
# $Id: Makefile.nmake,v 1.3 2003/06/14 20:45:28 guy Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
include ..\..\config.nmake
|
include ..\..\config.nmake
|
||||||
|
@ -13,7 +13,7 @@ OBJECTS=packet-pcli.obj
|
||||||
|
|
||||||
pcli.dll pcli.exp pcli.lib : packet-pcli.obj ..\plugin_api.obj
|
pcli.dll pcli.exp pcli.lib : packet-pcli.obj ..\plugin_api.obj
|
||||||
link -dll /out:pcli.dll packet-pcli.obj ..\plugin_api.obj \
|
link -dll /out:pcli.dll packet-pcli.obj ..\plugin_api.obj \
|
||||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib
|
$(GLIB_LIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJECTS) pcli.dll pcli.exp pcli.lib $(PDB_FILE)
|
rm -f $(OBJECTS) pcli.dll pcli.exp pcli.lib $(PDB_FILE)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# $Id: Makefile.nmake,v 1.3 2003/06/14 20:36:04 guy Exp $
|
# $Id: Makefile.nmake,v 1.4 2003/06/14 20:45:29 guy Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
include ..\..\config.nmake
|
include ..\..\config.nmake
|
||||||
|
@ -13,7 +13,7 @@ OBJECTS=packet-rtnet.obj
|
||||||
|
|
||||||
rtnet.dll rtnet.exp rtnet.lib : packet-rtnet.obj ..\plugin_api.obj
|
rtnet.dll rtnet.exp rtnet.lib : packet-rtnet.obj ..\plugin_api.obj
|
||||||
link -dll /out:rtnet.dll packet-rtnet.obj ..\plugin_api.obj \
|
link -dll /out:rtnet.dll packet-rtnet.obj ..\plugin_api.obj \
|
||||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib
|
$(GLIB_LIBS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(OBJECTS) rtnet.dll rtnet.exp rtnet.lib $(PDB_FILE)
|
rm -f $(OBJECTS) rtnet.dll rtnet.exp rtnet.lib $(PDB_FILE)
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# $Id: Makefile.nmake,v 1.29 2003/06/14 20:36:04 guy Exp $
|
# $Id: Makefile.nmake,v 1.30 2003/06/14 20:45:29 guy Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
include ..\config.nmake
|
include ..\config.nmake
|
||||||
|
@ -42,7 +42,7 @@ OBJECTS=ascend-grammar.obj \
|
||||||
|
|
||||||
|
|
||||||
wiretap_LIBS = \
|
wiretap_LIBS = \
|
||||||
$(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
|
$(GLIB_LIBS) \
|
||||||
$(ZLIB_DIR)\zlib.lib
|
$(ZLIB_DIR)\zlib.lib
|
||||||
|
|
||||||
all: wiretap-$(WTAP_VERSION).dll
|
all: wiretap-$(WTAP_VERSION).dll
|
||||||
|
|
Loading…
Reference in New Issue