[294] in Kerberos-V5-bugs
random-imake-changes.patch
daemon@ATHENA.MIT.EDU (Marc Horowitz)
Fri Feb 26 17:55:16 1993
To: krb5-bugs@MIT.EDU
Date: Fri, 26 Feb 1993 17:51:46 -0500
From: Marc Horowitz <marc@Aktis.COM>
** Random fixes and changes to Imakefiles and related files
./Imakefile
patch is relative to Steve Lunt's changes
install-mkdirs additions
./config/sun.cf
HasGCC should be HasGcc
./include/Imakefile
Descend into KerberosIV, too
./include/kerberosIV/Imakefile
added some dummy rules
./include/krb5/Imakefile
Install config.h and osconf.h
./lib/Imakefile
Install krb425 and des425 libraries
./lib/des/Imakefile
made $(OBJS), not $(SRCS), dependent on generated .c and .h files
make includes:: depend on depend
Need depend:: dependencies for .h and .c files that are built
automatically.
*** ./include/kerberosIV/Imakefile.old 1992/11/04 20:57:56
--- ./include/kerberosIV/Imakefile 1992/11/05 19:49:23
***************
*** 1,3 ****
--- 1,9 ----
KRB4_HEADERS=krb.h des.h kadm.h mit-copyright.h
+ all::
+
+ clean::
+
+ depend::
+
Krb5InstallHeaders($(KRB4_HEADERS),$(KRB5_INCDIR)/kerberosIV)
*** ./lib/Imakefile.old 1992/08/21 03:21:29
--- ./lib/Imakefile 1992/11/04 21:03:50
***************
*** 121,126 ****
--- 121,128 ----
Krb5InstallLibrary(krb5,$(KRB5_LIBDIR))
Krb5InstallLibrary($(DESLIB),$(KRB5_LIBDIR))
+ Krb5InstallLibrary(krb425,$(KRB5_LIBDIR))
+ Krb5InstallLibrary(des425,$(KRB5_LIBDIR))
SharedLibraryTarget(kdb5,-L$(KRB5_LIBDIR) -Lshared $(LDLOCATIONS) -lkrb5 -l$(DESLIB) $(ISODELIB) -lcom_err)
/* SharedLibraryTarget(des425,-L$(KRB5_LIBDIR) -Lshared $(LDLOCATIONS) -l$(DESLIB)) */
*** ./include/krb5/Imakefile.old 1992/03/25 14:57:30
--- ./include/krb5/Imakefile 1992/11/16 22:01:22
***************
*** 42,46 ****
depend::
! Krb5InstallHeaders($(KRB5_HEADERS),$(KRB5_INCDIR)/krb5)
--- 42,46 ----
depend::
! Krb5InstallHeaders($(KRB5_HEADERS) config.h osconf.h,$(KRB5_INCDIR)/krb5)
*** ./lib/des/Imakefile.old 1992/08/21 02:59:25
--- ./lib/des/Imakefile 1992/11/23 16:15:50
***************
*** 66,71 ****
--- 66,73 ----
DESTESTOBJ = destest.o
+ includes:: depend
+
all::
depend:: des.c $(SRCS)
***************
*** 73,79 ****
DependTarget()
! $(SRCS): fp.c ip.c key_perm.h odd.h p.c p_table.h s_table.h
clean::
$(RM) fp.c ip.c key_perm.h odd.h p.c p_table.h s_table.h
--- 75,81 ----
DependTarget()
! $(OBJS): fp.c ip.c key_perm.h odd.h p.c p_table.h s_table.h
clean::
$(RM) fp.c ip.c key_perm.h odd.h p.c p_table.h s_table.h
***************
*** 128,130 ****
--- 130,136 ----
./make_st s_table.h
NormalLintTarget($(SRCS))
+
+ depend:: key_perm.h odd.h p_table.h s_table.h
+
+ depend:: fp.c ip.c p.c
*** ./include/Imakefile.old 1991/06/06 09:35:05
--- ./include/Imakefile 1992/11/04 20:52:20
***************
*** 25,30 ****
#define IHaveSubdirs
#define PassCDebugFlags
! SUBDIRS=krb5
MakeSubdirs($(SUBDIRS))
--- 25,30 ----
#define IHaveSubdirs
#define PassCDebugFlags
! SUBDIRS=krb5 kerberosIV
MakeSubdirs($(SUBDIRS))
*** ./config/sun.cf.old 1992/11/10 18:53:02
--- ./config/sun.cf 1992/12/09 15:10:09
***************
*** 48,52 ****
--- 48,53 ----
#define DesDefines -DBIG -DMUSTALIGN -DMSBFIRST
+ /*
#define UseSedHack
*/
\ No newline at end of file
*** ./Imakefile.old 1992/11/10 18:54:30
--- ./Imakefile 1993/01/03 21:25:35
***************
*** 34,44 ****
make ${MFLAGS} all
SUBDIRS = include lib kdc admin kadmin slave clients appl tests config-files
! LNINSTALLDIRS =
MakeSubdirs($(SUBDIRS))
depend:: includes
install::
$(MAKE) $(MFLAGS) install.man
--- 34,53 ----
make ${MFLAGS} all
SUBDIRS = include lib kdc admin kadmin slave clients appl tests config-files
! INSTALLMKDIRS = $(KRB5ROOT) $(KRB5MANROOT) $(KRB5OTHERMKDIRS) \
! $(ADMIN_BINDIR) $(SERVER_BINDIR) $(CLIENT_BINDIR) \
! $(ADMIN_MANDIR) $(SERVER_MANDIR) $(CLIENT_MANDIR) \
! $(FILE_MANDIR) $(KRB5_LIBDIR) $(KRB5_INCDIR) \
! $(KRB5_INCSUBDIRS)
+ install:: install-mkdirs
+
MakeSubdirs($(SUBDIRS))
depend:: includes
+
+ install-mkdirs:
+ -mkdir $(INSTALLMKDIRS)
install::
$(MAKE) $(MFLAGS) install.man
