diff options
| -rw-r--r-- | src/util/ss/ChangeLog | 6 | ||||
| -rw-r--r-- | src/util/ss/Makefile.in | 51 | ||||
| -rw-r--r-- | src/util/ss/configure.in | 7 |
3 files changed, 22 insertions, 42 deletions
diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog index 1276069ace..cecc9e3bc1 100644 --- a/src/util/ss/ChangeLog +++ b/src/util/ss/ChangeLog @@ -1,3 +1,9 @@ +Tue Nov 18 19:22:34 1997 Tom Yu <tlyu@mit.edu> + + * configure.in: Update to new library build system. + + * Makefile.in: Update to new library build system. + Thu Sep 18 20:44:03 1997 Tom Yu <tlyu@mit.edu> * utils.c: Replace HAS_STRDUP with something more sane. diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in index 991d31bce2..405ceeb14c 100644 --- a/src/util/ss/Makefile.in +++ b/src/util/ss/Makefile.in @@ -8,6 +8,16 @@ all:: TOP=$(BUILDTOP) +LIB=ss +LIBMAJOR=1 +LIBMINOR=0 +RELDIR=../util/ss + +STOBJLISTS=OBJS.ST + +clean-unix:: clean-liblinks clean-libs clean-libobjs +install-unix:: install-libs + # hard coded srcdir/.. is so that ss/ss.h works # hard coded .. is so that ss/ss_err.h works @@ -15,13 +25,10 @@ TOP=$(BUILDTOP) # CFLAGS= -I${INCDIR} -I. -I.. -I../et -g LOCALINCLUDE= -I. -I$(srcdir)/ -I$(srcdir)/.. -I$(srcdir)/../et -I.. -# for the library - -LIB= libss.a - # with ss_err.o first, ss_err.h should get rebuilt first too. should not # be relying on this, though. -OBJS= ss_err.o \ +STLIBOBJS=\ + ss_err.o \ std_rqs.o \ invocation.o help.o \ execute_cmd.o listen.o parse.o error.o prompt.o \ @@ -64,7 +71,8 @@ FILES= $(SRCS) $(MKCMDSFILES) $(HFILES) \ # stuff to build # -all-unix:: mk_cmds ct_c.awk ct_c.sed libss.a includes # libss_p.a lint +all-unix:: mk_cmds ct_c.awk ct_c.sed includes # libss_p.a lint +all-unix:: all-liblinks all-mac:: all-windows:: all-unix @@ -74,24 +82,8 @@ dist: archives install:: -#install:: libss.a -# $(INSTALLLIB) libss.a ${DESTDIR}$(LIBDIR)/libss.a -# $(RANLIB) ${DESTDIR}$(LIBDIR)/libss.a -# @rm -rf ${DESTDIR}$(INCLDIR)/ss -# @mkdir ${DESTDIR}$(INCLDIR)/ss - - includes:: mk_cmds ct_c.sed ct_c.awk ss_err.h -#install:: $(HFILES) copyright.h -# for i in $(HFILES) copyright.h; do \ -# $(INSTALLFILE) $(srcdir)/$$i ${DESTDIR}$(INCLDIR)/ss/$$i; \ -# done - -#install:: copyright.h -# $(INSTALLFILE) $(srcdir)/copyright.h ${DESTDIR}$(INCLDIR)/ss/mit-sipb-copyright.h -# - std_rqs.c: std_rqs.ct ss_err.h: ss_err.et @@ -110,21 +102,6 @@ ct.tab.c ct.tab.h: ct.y $(MV) y.tab.h ct.tab.h # install_library_target(ss,$(OBJS),$(SRCS),) -all:: libss.a - -libss.a: $(OBJS) - $(ARADD) $@ $(OBJS) - $(RANLIB) $@ - -clean:: - $(RM) libss.a - -libss.o: $(OBJS) - $(LD) -r -s -o $@ $(OBJS) - $(CHMOD) -x $@ - -# program(mk_cmds,$(MKCMDSOBJS), , LEXLIB BSDLIB,$(PROGDIR)) -# all:: mk_cmds #mk_cmds: $(MKCMDSOBJS) # $(CC) $(CFLAGS) -o $@ $(MKCMDSOBJS) $(LEXLIB) $(BSDLIB) diff --git a/src/util/ss/configure.in b/src/util/ss/configure.in index 29c57ba3ba..7701bcb40c 100644 --- a/src/util/ss/configure.in +++ b/src/util/ss/configure.in @@ -3,9 +3,6 @@ CONFIG_RULES AC_PROG_LEX AC_PROG_YACC AC_PROG_AWK -AC_PROG_ARCHIVE -AC_PROG_ARCHIVE_ADD -AC_PROG_RANLIB HAVE_YYLINENO AC_CHECK_FUNCS(strdup) CHECK_DIRENT @@ -18,6 +15,6 @@ AC_CHECK_HEADERS(stdlib.h) CopySrcHeader(ss.h,$(BUILDTOP)/include/ss) CopySrcHeader(mit-sipb-copyright.h,$(BUILDTOP)/include/ss) CopyHeader(ss_err.h,$(BUILDTOP)/include/ss) -LinkFileDir([$](TOPLIBD)/libss.a,libss.a,../util/ss) -AppendRule([all:: [$](TOPLIBD)/libss.a]) +KRB5_BUILD_LIBRARY_STATIC +KRB5_BUILD_LIBOBJS V5_AC_OUTPUT_MAKEFILE |