NOENCRYPTION changes.

programmer: jtkohl
auditor: steiner

diff --git a/util/imake.includes/Imake.rules b/util/imake.includes/Imake.rules
index 75c68d899f688c1dddeb7cb2bd8270b6c2067c00..e315196a31f838a918df493bb4d0192e03742e63 100644 (file)
--- a/util/imake.includes/Imake.rules
+++ b/util/imake.includes/Imake.rules
@@ -66,7 +66,7 @@ concat3(lib,libname,_p.a): objs                                               @@\
 lint:: concat3(llib-l,libname,.ln)                                     @@\
                                                                        @@\
 concat3(llib-l,libname,.ln): srcs                                      @@\
-       $(LINT) concat(-C,libname) $(CFLAGS) srcs lintlibs              @@\
+       $(LINT) concat(-C,libname) $(LINTFLAGS) srcs lintlibs           @@\
                                                                        @@\
 clean::                                                                @@\
        $(RM) concat3(lib,libname,.a) concat3(lib,libname,_p.a)         @@\
@@ -76,10 +76,10 @@ clean::                                                             @@\
                                                                        @@\
 install::                                                              @@\
        $(INSTALLFILE) concat3(lib,libname,.a) concat4($(DESTDIR)$(LIBDIR)/,lib,libname,.a)     @@\
-       $(RANLIB) concat4($(DESTDIR)$(LIBDIR)/,lib,libname,.a)          @@\
+       $(RANLIB) -t concat4($(DESTDIR)$(LIBDIR)/,lib,libname,.a)       @@\
        $(INSTALLFILE) concat3(lib,libname,_p.a) concat4($(DESTDIR)$(LIBDIR)/,lib,libname,_p.a) @@\
-       $(RANLIB) concat4($(DESTDIR)$(LIBDIR)/,lib,libname,_p.a)                @@\
-       $(INSTALLFILE) concat3(llib-l,libname,.ln) concat4($(DESTDIR)$(LIBDIR)/lint,llib-l,libname,.ln) @@\
+       $(RANLIB) -t concat4($(DESTDIR)$(LIBDIR)/,lib,libname,_p.a)     @@\
+       $(INSTALLFILE) concat3(llib-l,libname,.ln) concat4($(DESTDIR)$(LINTLIBDIR)/,llib-l,libname,.ln) @@\
 
 #else /* !PROFILED_LIBS */
 /*
@@ -116,7 +116,7 @@ concat3(lib,libname,.a): objs                                               @@\
 lint:: concat3(llib-l,libname,.ln)                                     @@\
                                                                        @@\
 concat3(llib-l,libname,.ln): srcs                                      @@\
-       $(LINT) concat(-C,libname) $(CFLAGS) srcs lintlibs              @@\
+       $(LINT) concat(-C,libname) $(LINTFLAGS) srcs lintlibs           @@\
                                                                        @@\
 clean::                                                                @@\
        $(RM) concat3(lib,libname,.a)                                   @@\
@@ -126,7 +126,7 @@ clean::                                                             @@\
 install::                                                              @@\
        $(INSTALLFILE) concat3(lib,libname,.a) concat4($(DESTDIR)$(LIBDIR)/,lib,libname,.a)     @@\
        $(RANLIB) -t concat4($(DESTDIR)$(LIBDIR)/,lib,libname,.a)       @@\
-       $(INSTALLFILE) concat3(llib-l,libname,.ln) concat4($(DESTDIR)$(LIBDIR)/lint,llib-l,libname,.ln) @@\
+       $(INSTALLFILE) concat3(llib-l,libname,.ln) concat4($(DESTDIR)$(LINTLIBBDIR)/,llib-l,libname,.ln)        @@\
 
 #endif /* PROFILED_LIBS */
 
@@ -288,7 +288,7 @@ clean::                                                             @@\
 all:: pgm                                                              @@\
                                                                        @@\
 pgm: objs localdeps                                                    @@\
-       $(CC) $(CFLAGS) -o $@ objs localdeps syslibs                    @@\
+       $(CC) $(CFLAGS) -o $@ objs syslibs                              @@\
                                                                        @@\
 install::                                                              @@\
        $(INSTALLSUID) pgm ${DESTDIR}installdir/pgm                     @@\
@@ -304,7 +304,7 @@ clean::                                                             @@\
 all:: pgm                                                              @@\
                                                                        @@\
 pgm: objs localdeps                                                    @@\
-       $(CC) $(CFLAGS) -o $@ objs localdeps syslibs                    @@\
+       $(CC) $(CFLAGS) -o $@ objs syslibs                              @@\
                                                                        @@\
 install::                                                              @@\
        $(INSTALLRAW) instopts pgm ${DESTDIR}installdir/pgm             @@\

diff --git a/util/imake.includes/Imake.tmpl b/util/imake.includes/Imake.tmpl
index 2fd865953ba6e48e80af1ef990f9b5ee61ad9dea..2b411182af68c6f1b329351a205e22ebeb54a48c 100644 (file)
--- a/util/imake.includes/Imake.tmpl
+++ b/util/imake.includes/Imake.tmpl
@@ -16,18 +16,14 @@ NEWTOP=NEW_TOP
 BUILDTOP=NEW_TOP
 #endif
 
+/* The makedepend program */
 DEPEND=$(BUILDTOP)/util/makedepend/makedepend
+/* The Imake command line */
 IMAKE=$(BUILDTOP)/util/imake/imake -I$(BUILDTOP)/util/imake.includes
 
-KRB_LIB=$(BUILDTOP)/lib/krb/libkrb.a
-DES_LIB=$(BUILDTOP)/lib/des/libdes.a
-KRB_ADM=$(BUILDTOP)/lib/kadm/libkadm.a
-KDB_LIB=$(BUILDTOP)/lib/kdb/libkdb.a
-COM_ERR=-lcom_err
-
 INCLUDE= -I$(BUILDTOP)/include
 CFLAGS=$(DBG) $(INCLUDE) $(DEFINES) $(GLOBAL_CDEFS)
-
+LINTFLAGS=$(INCLUDE) $(DEFINES) $(GLOBAL_CDEFS)
 #include "config.Imakefile"
  
 #include "Imake.rules"