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

8 files changed, 17 insertions, 18 deletions

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)