Use "$(OBJECTS)" whenever a complete list of .obj files appears, rather

than repeating the list from the setting of OBJECTS.

svn path=/trunk/; revision=8893

10 files changed, 30 insertions, 42 deletions

diff --git a/plugins/acn/Makefile.nmake b/plugins/acn/Makefile.nmake
index 185b5fbbbd..c0ca4caab4 100644
--- a/plugins/acn/Makefile.nmake
+++ b/plugins/acn/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.1 2003/10/14 01:18:11 guy Exp $
+# $Id: Makefile.nmake,v 1.2 2003/11/06 09:05:10 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -11,8 +11,8 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 OBJECTS=packet-acn.obj 
 
-acn.dll acn.exp acn.lib : packet-acn.obj ..\plugin_api.obj
-	link -dll /out:acn.dll packet-acn.obj ..\plugin_api.obj \
+acn.dll acn.exp acn.lib : $(OBJECTS) ..\plugin_api.obj
+	link -dll /out:acn.dll $(OBJECTS) ..\plugin_api.obj \
 	$(GLIB_LIBS)
 
 clean:
diff --git a/plugins/artnet/Makefile.nmake b/plugins/artnet/Makefile.nmake
index 511224c9ef..7b69cfc00d 100644
--- a/plugins/artnet/Makefile.nmake
+++ b/plugins/artnet/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.4 2003/10/10 21:31:49 guy Exp $
+# $Id: Makefile.nmake,v 1.5 2003/11/06 09:05:10 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -11,8 +11,8 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 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 \
+artnet.dll artnet.exp artnet.lib : $(OBJECTS) ..\plugin_api.obj
+	link -dll /out:artnet.dll $(OBJECTS) ..\plugin_api.obj \
 	$(GLIB_LIBS)
 
 clean:
diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake
index 649add09bf..091bc46d01 100644
--- a/plugins/asn1/Makefile.nmake
+++ b/plugins/asn1/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.3 2003/10/28 20:44:51 guy Exp $
+# $Id: Makefile.nmake,v 1.4 2003/11/06 09:05:11 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -11,8 +11,8 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GTK_CFLAGS) \
 
 OBJECTS=packet-asn1.obj 
 
-asn1.dll asn1.exp asn1.lib : packet-asn1.obj ..\plugin_api.obj
-	link -dll /out:asn1.dll packet-asn1.obj ..\plugin_api.obj \
+asn1.dll asn1.exp asn1.lib : $(OBJECTS) ..\plugin_api.obj
+	link -dll /out:asn1.dll $(OBJECTS) ..\plugin_api.obj \
 	$(GTK_LIBS)
 
 clean:
diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index c072574136..0903311e0e 100644
--- a/plugins/docsis/Makefile.nmake
+++ b/plugins/docsis/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.6 2003/10/10 21:31:49 guy Exp $
+# $Id: Makefile.nmake,v 1.7 2003/11/06 09:05:12 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -22,20 +22,8 @@ OBJECTS=packet-docsis.obj packet-bpkmattr.obj \
 	packet-dsareq.obj packet-dsdrsp.obj \
 	packet-rngreq.obj packet-vendor.obj
 
-docsis.dll docsis.exp docsis.lib : packet-docsis.obj packet-bpkmattr.obj packet-dsarsp.obj packet-macmgmt.obj packet-rngrsp.obj packet-bpkmreq.obj packet-dscack.obj packet-map.obj packet-tlv.obj packet-bpkmrsp.obj packet-dscreq.obj packet-regack.obj packet-uccreq.obj packet-dscrsp.obj packet-regreq.obj packet-uccrsp.obj packet-dsaack.obj packet-dsdreq.obj packet-regrsp.obj packet-ucd.obj packet-dsareq.obj packet-dsdrsp.obj packet-rngreq.obj packet-vendor.obj ..\plugin_api.obj 
-	link -dll /out:docsis.dll packet-docsis.obj \
-		packet-bpkmattr.obj packet-dsarsp.obj \
-		packet-macmgmt.obj packet-rngrsp.obj \
-		packet-bpkmreq.obj packet-dscack.obj \
-		packet-map.obj packet-tlv.obj \
-		packet-bpkmrsp.obj packet-dscreq.obj \
-		packet-regack.obj packet-uccreq.obj \
-		packet-dscrsp.obj packet-regreq.obj \
-		packet-uccrsp.obj packet-dsaack.obj \
-		packet-dsdreq.obj packet-regrsp.obj \
-		packet-ucd.obj packet-dsareq.obj \
-		packet-dsdrsp.obj packet-rngreq.obj \
-		packet-vendor.obj ..\plugin_api.obj  \
+docsis.dll docsis.exp docsis.lib : $(OBJECTS) ..\plugin_api.obj 
+	link -dll /out:docsis.dll $(OBJECTS) ..\plugin_api.obj  \
 	$(GLIB_LIBS)
 
 clean:
diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index 3cd9e4c77d..23a04bf941 100644
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.12 2003/10/10 21:31:50 guy Exp $
+# $Id: Makefile.nmake,v 1.13 2003/11/06 09:05:12 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -11,8 +11,8 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 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 \
+gryphon.dll gryphon.exp gryphon.lib : $(OBJECTS) ..\plugin_api.obj
+	link -dll /out:gryphon.dll $(OBJECTS) ..\plugin_api.obj \
 	$(GLIB_LIBS)
 
 clean:
diff --git a/plugins/lwres/Makefile.nmake b/plugins/lwres/Makefile.nmake
index 58b82f4ce2..8cd491fc2d 100644
--- a/plugins/lwres/Makefile.nmake
+++ b/plugins/lwres/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.3 2003/10/10 21:31:50 guy Exp $
+# $Id: Makefile.nmake,v 1.4 2003/11/06 09:05:12 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -11,8 +11,8 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 OBJECTS=packet-lwres.obj 
 
-lwres.dll lwres.exp lwres.lib : packet-lwres.obj ..\plugin_api.obj
-	link -dll /out:lwres.dll packet-lwres.obj ..\plugin_api.obj \
+lwres.dll lwres.exp lwres.lib : $(OBJECTS) ..\plugin_api.obj
+	link -dll /out:lwres.dll $(OBJECTS) ..\plugin_api.obj \
 	$(GLIB_LIBS)
 
 clean:
diff --git a/plugins/megaco/Makefile.nmake b/plugins/megaco/Makefile.nmake
index 553fe7e858..73f4776f49 100644
--- a/plugins/megaco/Makefile.nmake
+++ b/plugins/megaco/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.4 2003/10/10 21:31:51 guy Exp $
+# $Id: Makefile.nmake,v 1.5 2003/11/06 09:05:13 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -11,8 +11,8 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 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 \
+megaco.dll megaco.exp megaco.lib : $(OBJECTS) ..\plugin_api.obj
+	link -dll /out:megaco.dll $(OBJECTS) ..\plugin_api.obj \
 	$(GLIB_LIBS)
 
 clean:
diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake
index 16687e653a..def2123ad3 100644
--- a/plugins/mgcp/Makefile.nmake
+++ b/plugins/mgcp/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.8 2003/10/10 21:31:51 guy Exp $
+# $Id: Makefile.nmake,v 1.9 2003/11/06 09:05:13 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -11,8 +11,8 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 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 \
+mgcp.dll mgcp.exp mgcp.lib : $(OBJECTS) ..\plugin_api.obj
+	link -dll /out:mgcp.dll $(OBJECTS) ..\plugin_api.obj \
 	$(GLIB_LIBS)
 
 clean:
diff --git a/plugins/pcli/Makefile.nmake b/plugins/pcli/Makefile.nmake
index 1c31060d6f..d691025b45 100644
--- a/plugins/pcli/Makefile.nmake
+++ b/plugins/pcli/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.4 2003/10/10 21:31:52 guy Exp $
+# $Id: Makefile.nmake,v 1.5 2003/11/06 09:05:14 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -11,8 +11,8 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 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 \
+pcli.dll pcli.exp pcli.lib : $(OBJECTS) ..\plugin_api.obj
+	link -dll /out:pcli.dll $(OBJECTS) ..\plugin_api.obj \
 	$(GLIB_LIBS)
 
 clean:
diff --git a/plugins/rtnet/Makefile.nmake b/plugins/rtnet/Makefile.nmake
index ee6a518490..2440e43f7e 100644
--- a/plugins/rtnet/Makefile.nmake
+++ b/plugins/rtnet/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.5 2003/10/10 21:31:52 guy Exp $
+# $Id: Makefile.nmake,v 1.6 2003/11/06 09:05:14 guy Exp $
 #
 
 include ..\..\config.nmake
@@ -11,8 +11,8 @@ CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 
 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 \
+rtnet.dll rtnet.exp rtnet.lib : $(OBJECTS) ..\plugin_api.obj
+	link -dll /out:rtnet.dll $(OBJECTS) ..\plugin_api.obj \
 	$(GLIB_LIBS)
 
 clean: