Took the list of sources and object files in FSRCS, FOBJS, D3OBJS, and

D3SRCS, and inlined them into the OBJS and SRCS list.  This is
necessary so that the files are correctly picked up for the Macintosh
build.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7744 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index f8e3e918669394744bd1a6c6432dfe9f8d4c054c..92e7afc70cd07d884925fa47dc203ccb698844de 100644 (file)
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,10 @@
+Sat Mar 30 22:56:48 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+       * Makefile.in (SRCS): Took the list of sources and object files in
+               FSRCS, FOBJS, D3OBJS, and D3SRCS, and inlined them into
+               the OBJS and SRCS list.  This is necessary so that the
+               files are correctly picked up for the Macintosh build.
+
 Thu Mar 28 10:49:31 1996  Richard Basch  <basch@lehman.com>
 
        * init_rkey.c, d3_str2ky.c, d3_procky.c: Support ENCTYPE_DES3_CBC_RAW

diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index c54061c9cf56788fe747b40a9034b364d95a791f..36fb6e7b55f375d2f2fd3270af50457a5dcceece 100644 (file)
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -8,23 +8,6 @@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.$(LIBEXT)
 KLIB = $(TOPLIBD)/libkrb5.$(LIBEXT) $(TOPLIBD)/libcrypto.$(LIBEXT) $(COMERRLIB)
 DEPKLIB = $(TOPLIBD)/libkrb5.$(LIBEXT) $(TOPLIBD)/libcrypto.$(LIBEXT) $(COMERRLIB)
 
-FSRCS=$(srcdir)/f_cbc.c $(srcdir)/f_cksum.c \
-       $(srcdir)/f_sched.c $(srcdir)/f_ecb.c $(srcdir)/f_parity.c \
-       $(srcdir)/f_tables.c
-
-FOBJS=f_cbc.$(OBJEXT) f_cksum.$(OBJEXT) f_sched.$(OBJEXT) f_ecb.$(OBJEXT) f_parity.$(OBJEXT) f_tables.$(OBJEXT)
-
-D3SRCS=$(srcdir)/d3_cbc.c $(srcdir)/d3_ecb.c $(srcdir)/d3_kysched.c \
-       $(srcdir)/d3_procky.c $(srcdir)/d3_rndky.c $(srcdir)/d3_str2ky.c \
-       $(srcdir)/u_nfold.c
-
-D3OBJS=d3_cbc.$(OBJEXT) d3_ecb.$(OBJEXT) d3_kysched.$(OBJEXT) \
-       d3_procky.$(OBJEXT) d3_rndky.$(OBJEXT) d3_str2ky.$(OBJEXT) \
-       u_nfold.$(OBJEXT)
-
-OTHERSRCS= $(FSRCS) $(D3SRCS)
-OTHEROBJS= $(FOBJS) $(D3OBJS)
-
 .c.o:
        $(CC) $(CFLAGS) -c $(srcdir)/$*.c
 @SHARED_RULE@
@@ -40,7 +23,19 @@ OBJS=        cbc_cksum.$(OBJEXT)     \
        new_rn_key.$(OBJEXT)    \
        key_sched.$(OBJEXT)     \
        weak_key.$(OBJEXT)      \
-       $(OTHEROBJS)
+       f_cbc.$(OBJEXT)         \
+       f_cksum.$(OBJEXT)       \
+       f_sched.$(OBJEXT)       \
+       f_ecb.$(OBJEXT)         \
+       f_parity.$(OBJEXT)      \
+       f_tables.$(OBJEXT)      \
+       d3_cbc.$(OBJEXT)        \
+       d3_ecb.$(OBJEXT)        \
+       d3_kysched.$(OBJEXT)    \
+       d3_procky.$(OBJEXT)     \
+       d3_rndky.$(OBJEXT)      \
+       d3_str2ky.$(OBJEXT) \
+       u_nfold.$(OBJEXT)
 
 SRCS=  $(srcdir)/cs_entry.c    \
        $(srcdir)/cbc_cksum.c   \
@@ -53,7 +48,20 @@ SRCS=        $(srcdir)/cs_entry.c    \
        $(srcdir)/new_rn_key.c  \
        $(srcdir)/key_sched.c   \
        $(srcdir)/weak_key.c    \
-       $(OTHERSRCS)
+       $(srcdir)/f_cbc.c \
+       $(srcdir)/f_cksum.c \
+       $(srcdir)/f_sched.c \
+       $(srcdir)/f_ecb.c \
+       $(srcdir)/f_parity.c \
+       $(srcdir)/f_tables.c \
+       $(srcdir)/d3_cbc.c \
+       $(srcdir)/d3_ecb.c \
+       $(srcdir)/d3_kysched.c \
+       $(srcdir)/d3_procky.c \
+       $(srcdir)/d3_rndky.c \
+       $(srcdir)/d3_str2ky.c \
+       $(srcdir)/u_nfold.c
+
 
 all:: $(OBJS)