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/include/krb5/Makefile.in | |
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/include/krb5/Makefile.in')
-rw-r--r-- | src/include/krb5/Makefile.in | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in index a3ab510a13..68dec66993 100644 --- a/src/include/krb5/Makefile.in +++ b/src/include/krb5/Makefile.in @@ -17,11 +17,21 @@ BUILT_HEADERS = osconf.h all-unix:: autoconf.h $(BUILT_HEADERS) all-mac:: $(BUILT_HEADERS) -all-windows:: - $(RM) osconf.h autoconf.h autoconf.stamp - copy stock\osconf.h osconf.h - copy ..\win-mac.h autoconf.h +all-windows:: autoconf.h $(BUILT_HEADERS) + +##DOS##autoconf.h: ..\win-mac.h +##DOS## $(CP) ..\win-mac.h $@ +##DOS##osconf.h: stock\osconf.h +##DOS## $(CP) stock\osconf.h $@ + +# We need to comment out the Unix autoconf.h and osconf.h block below +# if we're building for Windows. Thus, we need to enclose them +# between the lines "##DOS##!if 0" and "##DOS##!endif". We enclosed +# the entire section between the long hashed lines to make the block +# stand out. +############################################################################### +##DOS##!if 0 # Should only rebuild autoconf.h here (use CONFIG_FILES=), but the weird krb5 # makefile post-processing is unconditional and would trash the makefile. autoconf.h: autoconf.stamp @@ -29,9 +39,6 @@ autoconf.stamp: $(srcdir)/autoconf.h.in $(thisconfigdir)/config.status (cd $(thisconfigdir) && $(SHELL) config.status) touch autoconf.stamp -depend:: - -install:: SYSCONFDIR = @sysconfdir@ LOCALSTATEDIR = @localstatedir@ PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \ @@ -46,6 +53,12 @@ osconf.h: $(OSCONFSRC) cat $(OSCONFSRC) | sed $(PROCESS_REPLACE) > osconf.new @if cmp -s osconf.new osconf.h ; then :; \ else (set -x; $(RM) osconf.h ; $(CP) osconf.new osconf.h; $(RM) osconf.new) fi +##DOS##!endif +############################################################################### + +depend:: + +install:: clean:: $(RM) osconf.new $(BUILT_HEADERS) |