From 50c4b99e8f4642e01d52e077162529217a530bc7 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Thu, 10 Oct 1996 19:06:26 +0000 Subject: [PATCH] * configure.in: Remove calls to CopySrcHeader * Makefile.in: More fixups; punt usage of CopySrcHeader and use explicit dependencies instead, thus avoiding abuse of double-colon rules. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9160 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/gssapi/generic/ChangeLog | 8 +++++++ src/lib/gssapi/generic/Makefile.in | 33 +++++++++++++++++------------ src/lib/gssapi/generic/configure.in | 2 -- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index 11c6de1c8..b642e0b84 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,3 +1,11 @@ +Thu Oct 10 15:03:38 1996 Tom Yu + + * configure.in: Remove calls to CopySrcHeader. + + * Makefile.in: More fixups; punt usage of CopySrcHeader and use + explicit dependencies instead, thus avoiding abuse of double-colon + rules. + Wed Oct 9 14:12:27 1996 Tom Yu * Makefile.in (all-unix): Fix up last change; depending on a phony diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index dc7b14909..21c34f938 100644 --- a/src/lib/gssapi/generic/Makefile.in +++ b/src/lib/gssapi/generic/Makefile.in @@ -16,6 +16,18 @@ ETSRCS= gssapi_err_generic.c ETOBJS= gssapi_err_generic.$(OBJEXT) ETHDRS= gssapi_err_generic.h +EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi +$(EHDRDIR): + mkdir $(EHDRDIR) + +HDRS= $(EHDRDIR)/gssapi.h \ + $(EHDRDIR)/gssapi_generic.h + +$(EHDRDIR)/gssapi.h: $(EHDRDIR) $(srcdir)/gssapi.h + $(CP) $(srcdir)/gssapi.h $@ +$(EHDRDIR)/gssapi_generic.h: $(EHDRDIR) $(srcdir)/gssapi_generic.h + $(CP) $(srcdir)/gssapi_generic.h $@ + gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c $(CC) $(CFLAGS) -c $*.c @SHARED_RULE_LOCAL@ @@ -68,18 +80,15 @@ OBJS = \ util_validate.$(OBJEXT) \ gssapi_err_generic.$(OBJEXT) -EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi -EXPORTED_HEADERS= gssapi.h gssapi_generic.h +$(OBJS): $(HDRS) $(ETHDRS) -HDRS= $(ETHDRS) +EXPORTED_HEADERS= gssapi.h gssapi_generic.h -all-unix:: shared $(SRCS) $(HDRS) includes -all-unix:: $(OBJS) +all-unix:: shared $(SRCS) $(EHDRDIR) $(ETHDRS) $(OBJS) -all-mac:: $(SRCS) $(HDRS) includes -all-max:: $(OBJS) +all-mac:: $(SRCS) $(HDRS) $(ETHDRS) $(OBJS) -all-windows:: $(SRCS) $(HDRS) win-include +all-windows:: $(SRCS) $(ETHDRS) win-include all-windows:: $(OBJS) win-include:: @@ -87,13 +96,13 @@ win-include:: copy gssapi.h $(EHDRDIR) copy gssapi_generic.h $(EHDRDIR) -unixmac: $(SRCS) $(HDRS) includes +unixmac: $(SRCS) $(ETHDRS) clean-unix:: - $(RM) $(ETHDRS) $(ETSRCS) shared/* + $(RM) $(ETHDRS) $(ETSRCS) $(HDRS) shared/* clean-mac:: - $(RM) $(ETHDRS) $(ETSRCS) shared/* + $(RM) $(ETHDRS) $(ETSRCS) $(HDRS) shared/* clean-windows:: $(RM) $(EHDRDIR)\gssapi.h $(EHDRDIR)\gssapi_generic.h @@ -107,5 +116,3 @@ install:: done depend:: $(ETSRCS) - -includes:: diff --git a/src/lib/gssapi/generic/configure.in b/src/lib/gssapi/generic/configure.in index 035b05da3..f0d075cfa 100644 --- a/src/lib/gssapi/generic/configure.in +++ b/src/lib/gssapi/generic/configure.in @@ -9,6 +9,4 @@ AC_SIZE_T AC_CHECK_SIZEOF(short) AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) -CopySrcHeader(gssapi.h,[$(EHDRDIR)]) -CopySrcHeader(gssapi_generic.h,[$(EHDRDIR)]) V5_AC_OUTPUT_MAKEFILE -- 2.26.2