summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1997-03-25 06:22:35 +0000
committerTheodore Tso <tytso@mit.edu>1997-03-25 06:22:35 +0000
commit89525adb21f9ef63a825f99607e04f307d56f65f (patch)
tree280394d04ce7eb56e82c5082eea93e16f083de72 /src
parent82d72a406fd3823b0ee00bfe41c4227018b454d8 (diff)
Fix up Macintosh and Windows build rules now that the top-level
Makefile doesn't exist any more. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10028 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/Makefile.in16
2 files changed, 10 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 595c077b4..8e898a4fd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 19 15:43:27 1997 Theodore Y. Ts'o <tytso@mit.edu>
+
+ * Makefile.in: Fix up Macintosh and Windows build rules now that
+ the top-level Makefile doesn't exist any more.
+
Mon Mar 24 13:49:15 1997 Tom Yu <tlyu@mit.edu>
* aclocal.m4: (KRB5_LIB_PARAMS): Add support for HP/UX, FreeBSD,
diff --git a/src/Makefile.in b/src/Makefile.in
index 5976f4576..0ec4f204e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -321,7 +321,7 @@ ETOUT = $(INC)asn1_err.h $(ET)asn1_err.c \
HOUT = $(INC)krb5.h $(GG)gssapi.h $(PR)profile.h
-CLEANUP= $(ETOUT) $(HOUT) \
+CLEANUP= Makefile $(ETOUT) $(HOUT) \
include/profile.h include/krb5/osconf.h \
winfile.list macfile.list
@@ -338,17 +338,14 @@ macfile.list:
find $(MACFILES) -prune -type f -print | \
sed -f config/winexclude.sed >> macfile.list
-Makefile.sav:
- rm -f Makefile.sav
- mv Makefile Makefile.sav
+dos-Makefile:
cat config/windows.in Makefile.in config/win-post.in | \
sed -e 's/^##DOS##//' -e 's/^##DOS//' > Makefile
-kerbsrc.zip: Makefile.sav awk-windows-mac winfile.list
+kerbsrc.zip: dos-Makefile awk-windows-mac winfile.list
rm -f kerbsrc.zip
$(ZIP) -Dlk kerbsrc.zip `cat winfile.list`
$(ZIP) -Dk kerbsrc.zip $(WINBINARYFILES)
- mv Makefile.sav Makefile
rm -f $(CLEANUP)
kerbsrc-nt.zip: Makefile.sav awk-windows-mac winfile.list
@@ -358,17 +355,16 @@ kerbsrc-nt.zip: Makefile.sav awk-windows-mac winfile.list
mv Makefile.sav Makefile
rm -f $(CLEANUP)
-dos-zipfiles: Makefile.sav awk-windows-mac winfile.list
+dos-zipfiles: dos-Makefile awk-windows-mac winfile.list
rm -f kerbsrc.zip
$(ZIP) -Dlk kerbsrc.zip `cat winfile.list`
$(ZIP) -Dk kerbsrc.zip $(WINBINARYFILES)
rm -f kerbsrc-nt.zip
$(ZIP) -Dl kerbsrc-nt.zip `cat winfile.list`
$(ZIP) -D kerbsrc-nt.zip $(WINBINARYFILES)
- mv Makefile.sav Makefile
rm -f $(CLEANUP)
-Macfile: macfile.list Makefile.sav
+Macfile: macfile.list
rm -f Macfile
sed -e 's|/|:|g' -e 's/^/:/' -e '/:.:/d' -e '/:mac:/d' macfile.list > macfile.maclist
grep '\.c$$' macfile.maclist > macsrcsgss
@@ -405,8 +401,6 @@ kerbsrc.mac.tar: awk-windows-mac macfile.list mac-bin-dirs Macfile
rm -f $(CLEANUP)
rm -rf bin
rm -f include/autoconf.h Makefile macsrc* macfile.maclist
- mv Makefile.sav Makefile
-
$(INC)asn1_err.h: $(AH) $(ET)asn1_err.et
$(AWK) -f $(AH) outfile=$@ $(ET)asn1_err.et