[OpenAFS-devel] removes a couple of redundant makefile defines, and a hardwired call to ld

[Nathan Neulinger]

--9amGYk9869ThD9tj
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

The CC=, LD=, and LORDER= in the MakefileProto are unecessary, they are 
inherited from Makefile.sun4x_5*. Additionally, the 
MakefileProto.SOLARIS in libuafs has two hardwired calls to 'ld' instead of '$(LD)'.

-- Nathan

------------------------------------------------------------
Nathan Neulinger                       EMail:  nneul@umr.edu
University of Missouri - Rolla         Phone: (573) 341-4841
Computing Services                       Fax: (573) 341-4216

--9amGYk9869ThD9tj
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="makefile-solaris-redundantdefs.diff"

Index: libafs/MakefileProto.SOLARIS
===================================================================
RCS file: /cvs/openafs/src/libafs/MakefileProto.SOLARIS,v
retrieving revision 1.3
diff -u -r1.3 MakefileProto.SOLARIS
--- libafs/MakefileProto.SOLARIS	2000/11/06 04:25:23	1.3
+++ libafs/MakefileProto.SOLARIS	2000/12/14 15:34:24
@@ -28,9 +28,6 @@
 
 # System specific build commands and flags
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
-LD = /usr/ccs/bin/ld
-LORDER = /usr/ccs/bin/lorder
-CC = /opt/SUNWspro/bin/cc
 KDEFS= -Dsun4c -DSUN4C_60 -DNFSCLIENT -DSYSACCT -DOLDSCSI -DVDDRV -D_KERNEL \
 	-DSYSV -dn ${ARCH_DEFS}
 
Index: libuafs/MakefileProto.SOLARIS
===================================================================
RCS file: /cvs/openafs/src/libuafs/MakefileProto.SOLARIS,v
retrieving revision 1.2
diff -u -r1.2 MakefileProto.SOLARIS
--- libuafs/MakefileProto.SOLARIS	2000/11/04 10:05:07	1.2
+++ libuafs/MakefileProto.SOLARIS	2000/12/14 15:34:24
@@ -13,7 +13,6 @@
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
 # System specific build commands and flags
-CC = /opt/SUNWspro/bin/cc
 DEFINES= -D_REENTRANT -DAFSDEBUG -DKERNEL -DUKERNEL -DAFS -DVICE
 CFLAGS=-I. -I.. ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
 OPTF=-O
@@ -73,9 +72,9 @@
 
 $(LIBAFSWEB): $(AFSWEBOBJ) ${DES}/libdes.a
 	-rm -f $(LIBAFSWEB)
-	ld -G -M../mapfile -o $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
+	$(LD) -G -M../mapfile -o $(LIBAFSWEB) $(AFSWEBOBJ) ${DES}/libdes.a $(WEBLIBS)
 
 
 $(LIBAFSWEBKRB): $(AFSWEBOBJKRB) $(DES)/libdes.a
 	-rm -f $(LIBAFSWEBKRB)
-	ld -G -M../mapfile -o $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)
+	$(LD) -G -M../mapfile -o $(LIBAFSWEBKRB) $(AFSWEBOBJKRB) ${DES}/libdes.a $(WEBLIBS)

--9amGYk9869ThD9tj--