Define the rule .c.o: in terms of libtool in the xgrid makefile.

Fixes SPARC bulk build problem.

2 files changed, 43 insertions, 35 deletions

diff --git a/graphics/GMT/files/patch-sum b/graphics/GMT/files/patch-sum
index 9bc54660919..1f8feb5a9af 100644
--- a/graphics/GMT/files/patch-sum
+++ b/graphics/GMT/files/patch-sum
@@ -1,28 +1,28 @@
-$NetBSD: patch-sum,v 1.6 2001/01/29 04:10:39 jtb Exp $
+$NetBSD: patch-sum,v 1.7 2001/03/25 23:33:48 jtb Exp $
 
-MD5 (patch-aa) = 21b36c41cf6f70666295e3133e78c427
-MD5 (patch-ab) = 3865f3b4d98b55a65fa308ad27f2d6e3
-MD5 (patch-ac) = 34dd3c33717877f70efeb143d57de09b
-MD5 (patch-ad) = dab1556098f72997ff9195b2a75b8090
-MD5 (patch-ae) = 1ad779053784a61501b672a0f95cab24
-MD5 (patch-af) = 9bc80d1f1f305fe60a5c24e90fdd329f
-MD5 (patch-ag) = 5fd9f8963a7fbba82ddb8526eda22801
-MD5 (patch-ah) = 81938a902823d3657c19bd8612a6455b
-MD5 (patch-ai) = af0285b9046f0d660a5d0319d91c62ba
-MD5 (patch-aj) = 6d50c47ffc927edb32eb5fdc3928cbd5
-MD5 (patch-ak) = 1849dea510e47cc66ab3ce23b3f690e2
-MD5 (patch-al) = f808f77f226ed7b7946a939212cdeee7
-MD5 (patch-am) = fa7eeff5c1656783c4f973c012936643
-MD5 (patch-an) = ebd2e25587c46d542a48ef194e1c2e8e
-MD5 (patch-ao) = be33051e64a4d0244701b15e5bc39273
-MD5 (patch-ap) = aafd583d305406308b312b05bc6c1dba
-MD5 (patch-aq) = 302727183c6ce31a9aa1d2874eaa4bb6
-MD5 (patch-ar) = b0419120d391c540fe929797bd3b4db4
-MD5 (patch-as) = 8d0a461ae3d785308ae9504d23add33c
-MD5 (patch-at) = a1f26ceb18ba2fe07e1137ee4b827b9c
-MD5 (patch-au) = d1997868dcd205b3d1cf694189b81bd0
-MD5 (patch-av) = 07af60e17414034ca9b53e69e9274735
-MD5 (patch-aw) = 872028c7c698b10eb2985340d01f3f8b
-MD5 (patch-ax) = 100fd6d5d6a549dc87daee208f77dd47
-MD5 (patch-ay) = 94f7b630815f3293d2159d3fb912ea58
-MD5 (patch-az) = 2ee40b4c77e54aad87ba051f6e1b7d96
+SHA1 (patch-aa) = 75b073c40bcff5bde65b4aeb25f164dbac4519d5
+SHA1 (patch-ab) = 3707fa9b99b72aceacae8266998b700dd377ca59
+SHA1 (patch-ac) = c314d354f78c35227be0a5d2df266fe2c18c6e93
+SHA1 (patch-ad) = fea2b81ecb54a643abbaaea21b786615442bb2ea
+SHA1 (patch-ae) = f87c702fbe91f77ec0273a0515be923e24615a91
+SHA1 (patch-af) = 738950d60a7c1b7eaafbb8f0f4144ae9790f9144
+SHA1 (patch-ag) = da95b6e041a3fa2d5476115b39d4d2c0f7ead3c1
+SHA1 (patch-ah) = 3a8e3ee14a309f3760ce06336f47a8c6560bba4c
+SHA1 (patch-ai) = 7ba770e49bcd06adea0696ec406285339cb54f31
+SHA1 (patch-aj) = a24396010796de92963b30ef1e8709bddbda0f83
+SHA1 (patch-ak) = 683832fa858b98f07b592abf9d892ff125a2d38f
+SHA1 (patch-al) = ba832c377d6b01118b53c3fb8833d09d8cb022ec
+SHA1 (patch-am) = 68a2e6011e27a53120998f74aee36b0afc46a402
+SHA1 (patch-an) = bdd7d552c69d82edd86ca0b1be68d449f787f402
+SHA1 (patch-ao) = 777182dafb5dd8b29a970faa3210885d6cc06341
+SHA1 (patch-ap) = 695b5873af36d256dbdd1c56e016296b68969416
+SHA1 (patch-aq) = 44da0f5af6d2462e401fd68a117de74869dbe5e8
+SHA1 (patch-ar) = 6dbf662a6781ab36c59b7a81399e151792443a85
+SHA1 (patch-as) = d8cd515386282addd2a8986ea3e91083f9faee16
+SHA1 (patch-at) = fbb76939958209d15107e6fdee979b60d93a592d
+SHA1 (patch-au) = 3c59b16d995de7b0b3cb837971dbcd995b34c685
+SHA1 (patch-av) = fcc8aafb4a8163c0eb38744b9c7a05162d57db08
+SHA1 (patch-aw) = 52375a2781c5e8085d84dbee245b6bae2d6eb2cf
+SHA1 (patch-ax) = 745fdb9e572f4ffb4564206069f9fa60e2069547
+SHA1 (patch-ay) = 67e36ed193f062d1216ee6ee9e52c62bc6c5b30d
+SHA1 (patch-az) = 442c210689410914cb68c2597903c3c21fa98942
diff --git a/graphics/GMT/patches/patch-ay b/graphics/GMT/patches/patch-ay
index a43f811b1f5..8060fbbd31c 100644
--- a/graphics/GMT/patches/patch-ay
+++ b/graphics/GMT/patches/patch-ay
@@ -1,6 +1,6 @@
-$NetBSD: patch-ay,v 1.2 2001/01/27 10:36:54 jtb Exp $
+$NetBSD: patch-ay,v 1.3 2001/03/25 23:33:48 jtb Exp $
 
---- src/xgrid/makefile.in.orig	Wed Oct 18 03:01:29 2000
+--- src/xgrid/makefile.in.orig
 +++ src/xgrid/makefile.in
 @@ -19,14 +19,14 @@
  #	Location of GMT and CDF header files
@@ -19,24 +19,32 @@ $NetBSD: patch-ay,v 1.2 2001/01/27 10:36:54 jtb Exp $
  
  uninstall:
  		\rm -f $(bindir)/xgridedit$(EXE)
-@@ -35,15 +35,16 @@
+@@ -35,15 +35,17 @@
  		\rm -f makefile config.cache config.log config.status
  
  clean:
 -		rm -f *.o xgridedit$(EXE)
-+		rm -f *.o *.lo .libs xgridedit$(EXE)
++		rm -fr *.o *.lo .libs xgridedit$(EXE)
  
  xgridedit:	$(OBJS) $(EDITOBJS) xgridedit.o
 -		$(CC) $(CFLAGS) xgridedit.o -o xgridedit $(OBJS) \
 -			$(EDITOBJS) $(CDF) $(XLIBS) $(LIBS) $(LDFLAGS)
-+		$(LIBTOOL) --mode=link $(CC) $(CFLAGS) xgridedit.lo -o	    \
-+		xgridedit $(OBJS:.o=.lo) $(EDITOBJS:.o=.lo) $(CDF) $(XLIBS) \
-+		$(LIBS) $(LDFLAGS)
++		$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o xgridedit   \
++		xgridedit.lo $(OBJS:.o=.lo) $(EDITOBJS:.o=.lo) $(CDF) \
++		$(XLIBS) $(LIBS) $(LDFLAGS)
  
  xgridedit.o:	xGridEdit.c xgrid_utility.h xgrid_controls.h \
  			xgrid_messages.h xgrid_view.h xgrid_textInput.h
 -		$(CC) $(CFLAGS) -c xGridEdit.c -o xgridedit.o
-+		$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c xGridEdit.c -o xgridedit.lo
++		$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c xGridEdit.c \
++		-o xgridedit.lo
  
  xgrid_utility.o:	xgrid_utility.h
  
+@@ -69,3 +71,6 @@
+ 
+ xgrid_view.o:		xgrid_utility.h xgrid_Xutility.h xgrid_GMTgrid.h \
+ 			xgrid_view.h
++
++.c.o:
++		$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<