summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1995-04-14 12:30:10 +0000
committerTheodore Tso <tytso@mit.edu>1995-04-14 12:30:10 +0000
commit2f06099a7d6b977f6ff873d0b74b9e2e843315be (patch)
tree17628c4c755fc0e41f3786e3983da6ec98fec5d9
parentb35f0fa9410e3c1a078af245c94ea07678a6545e (diff)
downloadkrb5-2f06099a7d6b977f6ff873d0b74b9e2e843315be.tar.gz
krb5-2f06099a7d6b977f6ff873d0b74b9e2e843315be.tar.xz
krb5-2f06099a7d6b977f6ff873d0b74b9e2e843315be.zip
Makefile.in, configure.in: Move dependency for all-$WHAT back
into Makefile.in so that the Windows port can pick up the line (since it doesn't use configure). Instead, change the name of target which causes the subdirectories to be built under Unix, and make that a dependency for all-unix. Gross, but this should fix things for both DOS and Windows. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5356 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/lib/ChangeLog9
-rw-r--r--src/lib/configure.in5
2 files changed, 11 insertions, 3 deletions
diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index 9e6e698ba..ab531a2ec 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -1,3 +1,12 @@
+Wed Apr 12 14:40:30 1995 Theodore Y. Ts'o (tytso@dcl)
+
+ * Makefile.in, configure.in: Move dependency for all-$WHAT back
+ into Makefile.in so that the Windows port can pick up the
+ line (since it doesn't use configure). Instead, change
+ the name of target which causes the subdirectories to be
+ built under Unix, and make that a dependency for all-unix.
+ Gross, but this should fix things for both DOS and Windows.
+
Thu Apr 13 16:56:50 1995 Keith Vetter (keithv@fusion.com)
* Makefile.in, libkrb5.def, gssapi.def (new):
diff --git a/src/lib/configure.in b/src/lib/configure.in
index b033be1e4..155ba3027 100644
--- a/src/lib/configure.in
+++ b/src/lib/configure.in
@@ -5,15 +5,14 @@ AC_SET_BUILDTOP
CONFIG_DIRS(krb5 kdb des425 crypto gssapi)
AC_PROG_ARCHIVE
AC_PROG_RANLIB
-MAKE_SUBDIRS("making",all)
+_MAKE_SUBDIRS("making",all-unix-subdirs,all)
MAKE_SUBDIRS("cleaning",clean)
MAKE_SUBDIRS("installing",install)
MAKE_SUBDIRS("checking",check)
LinkFile(libkrb5.a, ./krb5/libkrb5.a)
LinkFile(libcrypto.a, ./crypto/libcrypto.a)
LinkFile(libgssapi_krb5.a, ./gssapi/libgssapi_krb5.a)
-AppendRule([all-unix:: libkrb5.a libcrypto.a])
+AppendRule([all-unix:: all-unix-subdirs libkrb5.a libcrypto.a])
AppendRule([all-unix:: libgssapi_krb5.a])
-AppendRule([all:: all-$(WHAT)])
WITH_KRB5ROOT
V5_AC_OUTPUT_MAKEFILE