diff options
author | Danilo Almeida <dalmeida@mit.edu> | 1999-05-19 16:18:30 +0000 |
---|---|---|
committer | Danilo Almeida <dalmeida@mit.edu> | 1999-05-19 16:18:30 +0000 |
commit | bd08f80e40c6cbb63520869f5be3f1d832cc7865 (patch) | |
tree | 0923af367f9c5561bf021c83314576b9859451f6 /src/lib/gssapi | |
parent | 6b6c052bcdaa702e26b3a4560cf6f4c53a0621ec (diff) | |
download | krb5-bd08f80e40c6cbb63520869f5be3f1d832cc7865.tar.gz krb5-bd08f80e40c6cbb63520869f5be3f1d832cc7865.tar.xz krb5-bd08f80e40c6cbb63520869f5be3f1d832cc7865.zip |
These are a bunch of intertwined changes to the windows build.
This log message includes all of the different changes across several
Makefile.in files (and win-pre.in and win-post.in):
- Remove "-" from recursive windows make invocations so that we can bail
on a build error. New MIGNORE option restores the previous bailing
behavior.
- Update windows readme to reflect current practices.
- Add NO_OUTDIR synonym for NO_OUTPRE in windows build.
- Top-level windows Makefile now builds util which now builds
util/windows, util/et, and util/profile (instead of building them
directly).
- Remove trailing backslash from rule that creates the windows output dir.
This backslash would cause the rule to always be invoked.
- Move WCONFIG and WCONFIG_EXE definitions into win-pre.in.
- Remove rules in include directory that blindly copy include header
files from gssapi, et, and profile. Instead, use/add build rules to
the components that generate them that copy only when the file changes.
- Use dependencies in include/krb5 to copy header files instead of blindly
copying them. Add !if 0/!endif wrapper to Unix version of the rules.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11464 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/gssapi')
-rw-r--r-- | src/lib/gssapi/ChangeLog | 4 | ||||
-rw-r--r-- | src/lib/gssapi/Makefile.in | 12 | ||||
-rw-r--r-- | src/lib/gssapi/generic/ChangeLog | 5 | ||||
-rw-r--r-- | src/lib/gssapi/generic/Makefile.in | 2 | ||||
-rw-r--r-- | src/lib/gssapi/krb5/ChangeLog | 5 | ||||
-rw-r--r-- | src/lib/gssapi/krb5/Makefile.in | 10 |
6 files changed, 28 insertions, 10 deletions
diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog index 1c0636f9bc..8f794fa718 100644 --- a/src/lib/gssapi/ChangeLog +++ b/src/lib/gssapi/ChangeLog @@ -1,3 +1,7 @@ +Tue May 18 19:52:56 1999 Danilo Almeida <dalmeida@mit.edu> + + * Makefile.in: Remove - from recursive Win32 make invocation. + Mon May 10 15:21:50 1999 Danilo Almeida <dalmeida@mit.edu> * Makefile.in: Do win32 build in subdir. diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in index 30e6b9d544..992615d553 100644 --- a/src/lib/gssapi/Makefile.in +++ b/src/lib/gssapi/Makefile.in @@ -37,25 +37,25 @@ clean-windows:: all-windows:: cd generic @echo Making in gssapi\generic - -$(MAKE) -$(MFLAGS) + $(MAKE) -$(MFLAGS) cd ..\krb5 @echo Making in gssapi\krb5 - -$(MAKE) -$(MFLAGS) + $(MAKE) -$(MFLAGS) # cd ..\mechglue # @echo Making in gssapi\mechglue -# -$(MAKE) -$(MFLAGS) +# $(MAKE) -$(MFLAGS) cd .. clean-windows:: cd generic @echo Making clean in gssapi\generic - -$(MAKE) -$(MFLAGS) clean + $(MAKE) -$(MFLAGS) clean cd ..\krb5 @echo Making clean in gssapi\krb5 - -$(MAKE) -$(MFLAGS) clean + $(MAKE) -$(MFLAGS) clean # cd ..\mechglue # @echo Making clean in gssapi\mechglue -# -$(MAKE) -$(MFLAGS) clean +# $(MAKE) -$(MFLAGS) clean cd .. @echo Making clean in gssapi diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index 08a0e12002..c569582464 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,3 +1,8 @@ +Wed May 19 11:39:05 1999 Danilo Almeida <dalmeida@mit.edu> + + * Makefile.in: Fix windows cleanup to ignore any errors while + removing gssapi include dir. + Mon May 10 15:22:12 1999 Danilo Almeida <dalmeida@mit.edu> * Makefile.in: Do win32 build in subdir. diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index 1e21e04fd2..3b8e8999a1 100644 --- a/src/lib/gssapi/generic/Makefile.in +++ b/src/lib/gssapi/generic/Makefile.in @@ -122,7 +122,7 @@ clean-unix:: clean-libobjs clean-windows:: $(RM) $(HDRS) - if exist $(EHDRDIR)\nul rmdir $(EHDRDIR) + -if exist $(EHDRDIR)\nul rmdir $(EHDRDIR) includes-unix:: @if test -d $(EHDRDIR); then :; else (set -x; mkdir $(EHDRDIR)) fi diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index e554d09b5f..8e4d75ac5c 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,8 @@ +Wed May 19 11:40:52 1999 Danilo Almeida <dalmeida@mit.edu> + + * Makefile.in: Add windows build rules for putting header files in + include dir. + Mon May 10 15:22:27 1999 Danilo Almeida <dalmeida@mit.edu> * Makefile.in: Do win32 build in subdir. diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in index 0911be555d..54990db0bd 100644 --- a/src/lib/gssapi/krb5/Makefile.in +++ b/src/lib/gssapi/krb5/Makefile.in @@ -170,7 +170,9 @@ EXPORTED_HEADERS= gssapi_krb5.h ##DOS##LIBOBJS = $(OBJS) -all-windows:: win-include $(SRCS) $(HDRS) +GSSAPI_KRB5_HDR=$(EHDRDIR)$(S)gssapi_krb5.h + +all-windows:: win-include $(GSSAPI_KRB5_HDR) $(SRCS) $(HDRS) all-unix:: $(SRCS) $(HDRS) includes all-unix:: all-libobjs @@ -189,14 +191,16 @@ clean-unix:: win-include:: if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR) - copy gssapi_krb5.h $(EHDRDIR) + +$(GSSAPI_KRB5_HDR): gssapi_krb5.h + $(CP) gssapi_krb5.h $@ clean-unix:: clean-libobjs $(RM) $(ETHDRS) $(ETSRCS) clean-windows:: $(RM) $(EHDRDIR)\gssapi_krb5.h - if exist $(EHDRDIR)\nul rmdir $(EHDRDIR) + -if exist $(EHDRDIR)\nul rmdir $(EHDRDIR) install:: @set -x; for f in $(EXPORTED_HEADERS) ; \ |