diff options
| author | Tom Yu <tlyu@mit.edu> | 1997-02-09 17:43:52 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1997-02-09 17:43:52 +0000 |
| commit | 561f2cdd8613f26d7de48c567b603e8c06fe7e5a (patch) | |
| tree | 4165fe26da185697068044d1fba17cb15d5b19bc /src/util/dyn | |
| parent | 647d10f2b8efd96a47ce5864f685b17cc7705f9f (diff) | |
Merge of libhack_branch
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9831 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/util/dyn')
| -rw-r--r-- | src/util/dyn/ChangeLog | 4 | ||||
| -rw-r--r-- | src/util/dyn/Makefile.in | 40 | ||||
| -rw-r--r-- | src/util/dyn/configure.in | 7 |
3 files changed, 17 insertions, 34 deletions
diff --git a/src/util/dyn/ChangeLog b/src/util/dyn/ChangeLog index 2505d5b39..8c79ffefd 100644 --- a/src/util/dyn/ChangeLog +++ b/src/util/dyn/ChangeLog @@ -1,3 +1,7 @@ +Tue Dec 31 13:02:06 1996 Ezra Peisach <epeisach@mit.edu> + + * configure.in, Makefile.in: Update to new library build procedure. + Mon Jul 22 21:37:52 1996 Ezra Peisach <epeisach@kangaroo.mit.edu> * dyn.h: If __STDC__ is not defined, generate prototypes implying diff --git a/src/util/dyn/Makefile.in b/src/util/dyn/Makefile.in index e2c4255bd..293e9b4f2 100644 --- a/src/util/dyn/Makefile.in +++ b/src/util/dyn/Makefile.in @@ -1,12 +1,9 @@ +RELDIR=../util/dyn CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\.. ##DOSLIBNAME=libdyn.lib -.c.o: - $(CC) $(CFLAGS) -c $(srcdir)/$*.c -@SHARED_RULE@ - SRCS = $(srcdir)/dyn_create.c \ $(srcdir)/dyn_put.c \ $(srcdir)/dyn_debug.c \ @@ -29,37 +26,22 @@ OBJS = dyn_create.$(OBJEXT) \ dyn_insert.$(OBJEXT) \ dyn_initzero.$(OBJEXT) -LIB_SUBDIRS= . -LIBDONE= DONE +STLIBOBJS=$(OBJS) +STOBJLISTS=OBJS.ST +LIB=dyn +LIBMAJOR=1 +LIBMINOR=0 + -all-unix:: shared includes $(OBJS) +all-unix:: all-liblinks +clean-unix:: clean-liblinks clean-libs clean-libobjs +install-unix:: install-libs all-mac:: $(OBJS) all-windows:: $(OBJS) -shared: - mkdir shared +all-unix:: includes check-windows:: - -clean-unix:: - $(RM) shared/* - clean-mac:: clean-windows:: -DONE:: $(OBJS) - $(RM) DONE - echo $(OBJS) >DONE - -libdyn.$(STEXT): $(OBJS) - $(RM) $@ - $(ARADD) $@ $(OBJS) - $(RANLIB) $@ - -install:: libdyn.a - $(INSTALL_DATA) libdyn.a $(DESTDIR)$(KRB5_LIBDIR)/libdyn.a - $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libdyn.a - -clean:: - $(RM) libdyn.$(LIBEXT) libdyn.bak DONE - diff --git a/src/util/dyn/configure.in b/src/util/dyn/configure.in index 6ba8e6d24..e4db7dbfe 100644 --- a/src/util/dyn/configure.in +++ b/src/util/dyn/configure.in @@ -5,10 +5,7 @@ AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB AC_PROG_INSTALL AC_CHECK_FUNCS(memmove) -V5_SHARED_LIB_OBJS -V5_MAKE_SHARED_LIB(libdyn,1.0,../../lib, ../util/dyn) -dnl DEPLIBS is normally set by KRB5_LIBRARIES, but that makes assumptions -dnl which fail for libdyn. -AC_SUBST(DEPLIBS) +KRB5_BUILD_LIBOBJS +KRB5_BUILD_LIBRARY CopySrcHeader(dyn.h,[$](BUILDTOP)/include) V5_AC_OUTPUT_MAKEFILE |