diff options
author | Tom Yu <tlyu@mit.edu> | 1996-10-22 01:26:16 +0000 |
---|---|---|
committer | Tom Yu <tlyu@mit.edu> | 1996-10-22 01:26:16 +0000 |
commit | fdbb7d3f9e46f21c6da8510626b4ebc103b5d2c2 (patch) | |
tree | aed9258568cfed5a11438f47b6d7365f797e8521 /src/lib/rpc | |
parent | 316e8285cf9497f814e73224cc72481d600092d2 (diff) | |
download | krb5-fdbb7d3f9e46f21c6da8510626b4ebc103b5d2c2.zip krb5-fdbb7d3f9e46f21c6da8510626b4ebc103b5d2c2.tar.gz krb5-fdbb7d3f9e46f21c6da8510626b4ebc103b5d2c2.tar.bz2 |
* Makefile.in, configure.in: Fixes to work with new directory
recursion method.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9234 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/rpc')
-rw-r--r-- | src/lib/rpc/ChangeLog | 5 | ||||
-rw-r--r-- | src/lib/rpc/Makefile.in | 56 | ||||
-rw-r--r-- | src/lib/rpc/configure.in | 20 |
3 files changed, 65 insertions, 16 deletions
diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog index d64ceef..68c0f22 100644 --- a/src/lib/rpc/ChangeLog +++ b/src/lib/rpc/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 21 21:22:42 1996 Tom Yu <tlyu@mit.edu> + + * Makefile.in, configure.in: Fixes to work with new directory + recursion method. + Wed Oct 16 16:12:07 1996 Barry Jaspan <bjaspan@mit.edu> * svc_auth_gssapi.c (_svcauth_gssapi): accept add call_arg version diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in index 5c4a32b..29db6d2 100644 --- a/src/lib/rpc/Makefile.in +++ b/src/lib/rpc/Makefile.in @@ -97,6 +97,57 @@ OBJS = auth_none.$(OBJEXT) \ xdr_stdio.$(OBJEXT) \ xdr_alloc.$(OBJEXT) +HDRDIR=$(BUILDTOP)/include/rpc + +HDRS= $(HDRDIR)/auth.h \ + $(HDRDIR)/auth_gssapi.h \ + $(HDRDIR)/auth_unix.h \ + $(HDRDIR)/clnt.h \ + $(HDRDIR)/netdb.h \ + $(HDRDIR)/pmap_clnt.h \ + $(HDRDIR)/pmap_prot.h \ + $(HDRDIR)/pmap_rmt.h \ + $(HDRDIR)/rpc.h \ + $(HDRDIR)/rpc_msg.h \ + $(HDRDIR)/svc.h \ + $(HDRDIR)/svc_auth.h \ + $(HDRDIR)/types.h \ + $(HDRDIR)/xdr.h + +$(OBJS): $(HDRS) shared + +$(HDRDIR): + mkdir $@ + +$(HDRDIR)/auth.h: $(HDRDIR) $(srcdir)/auth.h + $(CP) $(srcdir)/auth.h $@ +$(HDRDIR)/auth_gssapi.h: $(HDRDIR) $(srcdir)/auth_gssapi.h + $(CP) $(srcdir)/auth_gssapi.h $@ +$(HDRDIR)/auth_unix.h: $(HDRDIR) $(srcdir)/auth_unix.h + $(CP) $(srcdir)/auth_unix.h $@ +$(HDRDIR)/clnt.h: $(HDRDIR) $(srcdir)/clnt.h + $(CP) $(srcdir)/clnt.h $@ +$(HDRDIR)/netdb.h: $(HDRDIR) $(srcdir)/netdb.h + $(CP) $(srcdir)/netdb.h $@ +$(HDRDIR)/pmap_clnt.h: $(HDRDIR) $(srcdir)/pmap_clnt.h + $(CP) $(srcdir)/pmap_clnt.h $@ +$(HDRDIR)/pmap_prot.h: $(HDRDIR) $(srcdir)/pmap_prot.h + $(CP) $(srcdir)/pmap_prot.h $@ +$(HDRDIR)/pmap_rmt.h: $(HDRDIR) $(srcdir)/pmap_rmt.h + $(CP) $(srcdir)/pmap_rmt.h $@ +$(HDRDIR)/rpc.h: $(HDRDIR) $(srcdir)/rpc.h + $(CP) $(srcdir)/rpc.h $@ +$(HDRDIR)/rpc_msg.h: $(HDRDIR) $(srcdir)/rpc_msg.h + $(CP) $(srcdir)/rpc_msg.h $@ +$(HDRDIR)/svc.h: $(HDRDIR) $(srcdir)/svc.h + $(CP) $(srcdir)/svc.h $@ +$(HDRDIR)/svc_auth.h: $(HDRDIR) $(srcdir)/svc_auth.h + $(CP) $(srcdir)/svc_auth.h $@ +$(HDRDIR)/xdr.h: $(HDRDIR) $(srcdir)/xdr.h + $(CP) $(srcdir)/xdr.h $@ +$(HDRDIR)/types.h: $(HDRDIR) types.h + $(CP) types.h $@ + LIB_SUBDIRS= . LIBDONE= DONE # @@ -115,7 +166,6 @@ SHLIB_LIBS=-lgssapi_krb5 -lkrb5 -lcrypto -lcom_err -ldyn SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@ SHLIB_LIBDIRS= @SHLIB_LIBDIRS@ -all-unix:: shared includes all-unix:: $(OBJS) all-mac:: $(OBJS) all-windows:: $(OBJS) @@ -126,7 +176,7 @@ shared: check-windows:: clean-unix:: - $(RM) shared/* + $(RM) shared/* $(HDRS) clean-mac:: clean-windows:: @@ -147,3 +197,5 @@ install:: libgssrpc.a clean:: $(RM) libgssrpc.$(LIBEXT) libgssrpc.bak DONE +# hack to force libs to get built before recursing into subdirs +all-recurse: libgssrpc.$(STEXT) diff --git a/src/lib/rpc/configure.in b/src/lib/rpc/configure.in index c23c77f..9458e2d 100644 --- a/src/lib/rpc/configure.in +++ b/src/lib/rpc/configure.in @@ -79,18 +79,10 @@ CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto AC_SUBST(CRYPTO_SH_VERS) COMERR_SH_VERS=$krb5_cv_shlib_version_libcom_err AC_SUBST(COMERR_SH_VERS) -CopySrcHeader(auth.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(auth_gssapi.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(auth_unix.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(clnt.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(netdb.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(pmap_clnt.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(pmap_prot.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(pmap_rmt.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(rpc.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(rpc_msg.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(svc.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(svc_auth.h,[$](BUILDTOP)/include/rpc) -CopyHeader(types.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(xdr.h,[$](BUILDTOP)/include/rpc) + +dnl +dnl This is gross but necessary because of the way we build shared libs +dnl +ALL_RECURSE= +AppendRule([all-unix:: all-recurse]) V5_AC_OUTPUT_MAKEFILE( ,types.h:types.hin) |