aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.nmake21
-rw-r--r--config.nmake7
-rw-r--r--epan/Makefile.nmake5
-rw-r--r--plugins/artnet/Makefile.nmake4
-rw-r--r--plugins/docsis/Makefile.nmake4
-rw-r--r--plugins/giop/Makefile.nmake7
-rw-r--r--plugins/gryphon/Makefile.nmake4
-rw-r--r--plugins/megaco/Makefile.nmake4
-rw-r--r--plugins/mgcp/Makefile.nmake4
-rw-r--r--plugins/pcli/Makefile.nmake4
-rw-r--r--plugins/rtnet/Makefile.nmake4
-rw-r--r--wiretap/Makefile.nmake4
12 files changed, 34 insertions, 38 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 8df985a09e..6b18c31690 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.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 <win32.mak>
@@ -449,10 +449,7 @@ ethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
gtk\libui.lib epan\ethereal.lib \
epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
wsock32.lib user32.lib \
- $(GTK_DIR)\gtk\gtk-$(GTK_VERSION).lib \
- $(GTK_DIR)\gdk\gdk-$(GTK_VERSION).lib \
- $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
- $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \
+ $(GTK_LIBS) \
!IFDEF ADNS_DIR
$(ADNS_DIR)\adns_win32\lib\adns_dll.lib \
!ENDIF
@@ -463,8 +460,7 @@ tethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
epan\ethereal.lib \
epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \
wsock32.lib user32.lib \
- $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
- $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \
+ $(GLIB_LIBS) \
!IFDEF ADNS_DIR
$(ADNS_DIR)\adns_win32\lib\adns_dll.lib \
!ENDIF
@@ -472,24 +468,21 @@ tethereal_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
editcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib \
- $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
- $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
+ $(GLIB_LIBS)
mergecap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib \
- $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
- $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
+ $(GLIB_LIBS)
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 \
- $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
- $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
+ $(GLIB_LIBS)
randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
user32.lib \
- $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib \
+ $(GLIB_LIBS) \
$(NET_SNMP_DIR)\win32\lib\libsnmp.lib
EXECUTABLES=ethereal.exe tethereal.exe editcap.exe mergecap.exe text2pcap.exe
diff --git a/config.nmake b/config.nmake
index d60abb3507..15a2b12551 100644
--- a/config.nmake
+++ b/config.nmake
@@ -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
#
@@ -69,3 +69,8 @@ MAKENSIS="C:/program files/nsis/makensis.exe"
#
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)
+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)
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 0a42f95cbd..d7e8f88ed1 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.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
@@ -18,8 +18,7 @@ CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
# For use when making ethereal.dll
libethereal_LIBS = \
wsock32.lib user32.lib \
- $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
- $(GLIB_DIR)\gmodule\gmodule-$(GLIB_VERSION).lib
+ $(GLIB_LIBS)
.c.obj::
$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
diff --git a/plugins/artnet/Makefile.nmake b/plugins/artnet/Makefile.nmake
index ffa1ff5ac5..87e3234f86 100644
--- a/plugins/artnet/Makefile.nmake
+++ b/plugins/artnet/Makefile.nmake
@@ -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
@@ -13,7 +13,7 @@ OBJECTS=packet-artnet.obj
artnet.dll artnet.exp artnet.lib : 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:
rm -f $(OBJECTS) artnet.dll artnet.exp artnet.lib $(PDB_FILE)
diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index f95b0c4fca..3dcee86126 100644
--- a/plugins/docsis/Makefile.nmake
+++ b/plugins/docsis/Makefile.nmake
@@ -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
@@ -36,7 +36,7 @@ docsis.dll docsis.exp docsis.lib : packet-docsis.obj packet-bpkmattr.obj packet-
packet-ucd.obj packet-dsareq.obj \
packet-dsdrsp.obj packet-rngreq.obj \
packet-vendor.obj ..\plugin_api.obj \
- $(GLIB_DIR)\glib-$(GLIB_VERSION).lib
+ $(GLIB_LIBS)
clean:
rm -f $(OBJECTS) docsis.dll docsis.exp docsis.lib $(PDB_FILE)
diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake
index f2fb16b6cf..10c178b28e 100644
--- a/plugins/giop/Makefile.nmake
+++ b/plugins/giop/Makefile.nmake
@@ -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
@@ -15,12 +15,11 @@ all : cosnaming.dll coseventcomm.dll
cosnaming.dll cosnaming.exp cosnaming.lib : 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
link -dll /out:coseventcomm.dll packet-coseventcomm.obj ..\plugin_api.obj \
- $(GLIB_DIR)\glib-$(GLIB_VERSION).lib
-
+ $(GLIB_LIBS)
clean:
rm -f $(OBJECTS) cosnaming.dll cosnaming.exp cosnaming.lib \
diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index 328650bd5d..dffad3eca1 100644
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -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
@@ -13,7 +13,7 @@ OBJECTS=packet-gryphon.obj
gryphon.dll gryphon.exp gryphon.lib : 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:
rm -f $(OBJECTS) gryphon.dll gryphon.exp gryphon.lib $(PDB_FILE)
diff --git a/plugins/megaco/Makefile.nmake b/plugins/megaco/Makefile.nmake
index b84be0cee1..ee27b2aff6 100644
--- a/plugins/megaco/Makefile.nmake
+++ b/plugins/megaco/Makefile.nmake
@@ -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
@@ -13,7 +13,7 @@ OBJECTS=packet-megaco.obj
megaco.dll megaco.exp megaco.lib : 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:
rm -f $(OBJECTS) megaco.dll megaco.exp megaco.lib $(PDB_FILE)
diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake
index 2c6e9d20bb..3d7bdfb75d 100644
--- a/plugins/mgcp/Makefile.nmake
+++ b/plugins/mgcp/Makefile.nmake
@@ -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
@@ -13,7 +13,7 @@ OBJECTS=packet-mgcp.obj
mgcp.dll mgcp.exp mgcp.lib : 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:
rm -f $(OBJECTS) mgcp.dll mgcp.exp mgcp.lib $(PDB_FILE)
diff --git a/plugins/pcli/Makefile.nmake b/plugins/pcli/Makefile.nmake
index 39e21fe00c..4c08249018 100644
--- a/plugins/pcli/Makefile.nmake
+++ b/plugins/pcli/Makefile.nmake
@@ -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
@@ -13,7 +13,7 @@ OBJECTS=packet-pcli.obj
pcli.dll pcli.exp pcli.lib : 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:
rm -f $(OBJECTS) pcli.dll pcli.exp pcli.lib $(PDB_FILE)
diff --git a/plugins/rtnet/Makefile.nmake b/plugins/rtnet/Makefile.nmake
index 345aa0ac36..4f3975e1f0 100644
--- a/plugins/rtnet/Makefile.nmake
+++ b/plugins/rtnet/Makefile.nmake
@@ -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
@@ -13,7 +13,7 @@ OBJECTS=packet-rtnet.obj
rtnet.dll rtnet.exp rtnet.lib : 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:
rm -f $(OBJECTS) rtnet.dll rtnet.exp rtnet.lib $(PDB_FILE)
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index babe8a58c7..3573c21d08 100644
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -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
@@ -42,7 +42,7 @@ OBJECTS=ascend-grammar.obj \
wiretap_LIBS = \
- $(GLIB_DIR)\glib-$(GLIB_VERSION).lib \
+ $(GLIB_LIBS) \
$(ZLIB_DIR)\zlib.lib
all: wiretap-$(WTAP_VERSION).dll
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 00:46:44 +0000