summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorRichard Basch <probe@mit.edu>1997-02-06 02:31:41 +0000
committerRichard Basch <probe@mit.edu>1997-02-06 02:31:41 +0000
commita0b9ce4bee60136363cfff7a93c4e42eab972c02 (patch)
tree400984337fe3766653ff4cc2cb6b7d3d7f87f3f4 /src/include
parenta9266b1dec31de9f33b0d032b885edd377a23ee5 (diff)
downloadkrb5-a0b9ce4bee60136363cfff7a93c4e42eab972c02.tar.gz
krb5-a0b9ce4bee60136363cfff7a93c4e42eab972c02.tar.xz
krb5-a0b9ce4bee60136363cfff7a93c4e42eab972c02.zip
Windows/NT integration (V1_0_WIN32_BRANCH merge)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9788 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
-rw-r--r--src/include/krb5/ChangeLog6
-rw-r--r--src/include/krb5/Makefile.in7
2 files changed, 11 insertions, 2 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 01201ba03..d3c889ae7 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 21 11:55:16 EST 1996 Richard Basch <basch@lehman.com>
+
+ * Makefile.in:
+ all-windows needed :: not :
+ clean up various generated files on all platforms, not just unix
+
Wed Oct 30 18:55:21 1996 Sam Hartman <hartmans@mit.edu>
* Makefile.in (LOCALSTATEDIR): Add localstatedir a and sysconfidr
diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index d60ac1ae8..b3500dd4b 100644
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -11,9 +11,10 @@ BUILT_HEADERS = osconf.h
all-unix:: autoconf.h $(BUILT_HEADERS)
all-mac:: $(BUILT_HEADERS)
-all-windows:
+all-windows::
+ $(RM) osconf.h autoconf.h autoconf.stamp
copy stock\osconf.h osconf.h
- echo /* not used in windows */ > autoconf.h
+ echo #include "win-mac.h" > autoconf.h
# Should only rebuild autoconf.h here (use CONFIG_FILES=), but the weird krb5
# makefile post-processing is unconditional and would trash the makefile.
@@ -46,4 +47,6 @@ clean::
clean-unix::
$(RM) $(ET_HEADERS) autoconf.h autoconf.stamp
clean-mac::
+ $(RM) osconf.h autoconf.h autoconf.stamp
clean-windows::
+ $(RM) osconf.h autoconf.h autoconf.stamp