From: Theodore Tso Date: Sat, 27 May 1995 00:23:35 +0000 (+0000) Subject: Add support for building shared libraries X-Git-Tag: krb5-1.0-beta6~1897 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4fbf97a1be3a0f12c3a757de9f89240133582fc4;p=krb5.git Add support for building shared libraries git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5904 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index cf1595e33..27c9be1b7 100644 --- a/src/lib/krb5/ChangeLog +++ b/src/lib/krb5/ChangeLog @@ -1,3 +1,7 @@ +Fri May 26 20:12:37 1995 Theodore Y. Ts'o (tytso@dcl) + + * configure.in, Makefile.in: Add support for building shared libraries. + Sat Apr 22 10:58:49 1995 Ezra Peisach (epeisach@kangaroo.mit.edu) * configure.in: Add rule for make check to descend to subdirs diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index 67f5157a4..073e4d4e6 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -6,6 +6,10 @@ TST=if test -n "`cat DONE`" ; then LIB_SUBDIRS= error_tables asn.1 ccache ccache/stdio ccache/file \ keytab keytab/file krb rcache free os posix $(BUILDTOP)/util/profile LIBUPDATE= $(BUILDTOP)/util/libupdate +LIBDONE= error_tables/DONE asn.1/DONE ccache/DONE ccache/stdio/DONE \ + ccache/file/DONE keytab/DONE keytab/file/DONE krb/DONE \ + rcache/DONE free/DONE os/DONE posix/DONE \ + $(BUILDTOP)/util/profile/DONE all:: all-$(WHAT) @@ -13,14 +17,7 @@ all-unix:: all-windows:: -libkrb5_ranlib: libkrb5.a - $(RANLIB) libkrb5.a - touch $@ - -libkrb5.a: error_tables/DONE asn.1/DONE ccache/DONE ccache/stdio/DONE \ - ccache/file/DONE keytab/DONE keytab/file/DONE krb/DONE \ - rcache/DONE free/DONE os/DONE posix/DONE \ - $(BUILDTOP)/util/profile/DONE +libkrb5.a: $(LIBDONE) if test -f $@ ; then \ for i in $(LIB_SUBDIRS) ; \ do \ @@ -32,16 +29,16 @@ libkrb5.a: error_tables/DONE asn.1/DONE ccache/DONE ccache/stdio/DONE \ $(LIBUPDATE) --force $@ $$i/DONE $$i ; \ done ; \ fi - touch libkrb5.stamp + $(RANLIB) libkrb5.a -install:: libkrb5_ranlib +install:: $(INSTALL_DATA) libkrb5.a $(DESTDIR)$(KRB5_LIBDIR)/libkrb5.a $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libkrb5.a clean:: clean-$(WHAT) clean-unix:: - $(RM) libkrb5.$(LIBEXT) libkrb5_ranlib libkrb5.stamp + $(RM) libkrb5.$(LIBEXT) clean-windows:: $(RM) krb5.lib krb5.bak diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog index 241fbea82..5f34d875f 100644 --- a/src/lib/krb5/asn.1/ChangeLog +++ b/src/lib/krb5/asn.1/ChangeLog @@ -1,3 +1,7 @@ +Fri May 26 20:19:15 1995 Theodore Y. Ts'o (tytso@dcl) + + * configure.in, Makefile.in: Add support for building shared libraries. + Tue May 23 16:22:57 1995 Theodore Y. Ts'o (tytso@dcl) * asn1_decode.c: Rearrange #include files so that krb5.h gets diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in index 24370fdd6..db19f840d 100644 --- a/src/lib/krb5/asn.1/Makefile.in +++ b/src/lib/krb5/asn.1/Makefile.in @@ -6,6 +6,10 @@ CFLAGS=$(CCOPTS) $(DEFS) EHDRDIR=$(BUILDTOP)/include/krb5/asn.1 +.c.o: + $(CC) $(CFLAGS) -c $(srcdir)/$*.c +@SHARED_RULE@ + SRCS= \ $(srcdir)asn1_decode.c\ $(srcdir)asn1_k_decode.c\ @@ -30,12 +34,19 @@ OBJS= \ asn1_k_encode.$(OBJEXT)\ asn1_misc.$(OBJEXT) -all:: $(OBJS) +all:: all-$(WHAT) + +all-unix:: shared $(OBJS) +all-mac:: $(OBJS) +all-windows:: $(OBJS) + +shared: + mkdir shared clean:: clean-$(WHAT) clean-unix:: - $(RM) $(OBJS) + $(RM) shared/* $(OBJS) clean-mac:: $(RM) $(OBJS) diff --git a/src/lib/krb5/asn.1/configure.in b/src/lib/krb5/asn.1/configure.in index 11a547e45..4d0380f96 100644 --- a/src/lib/krb5/asn.1/configure.in +++ b/src/lib/krb5/asn.1/configure.in @@ -1,9 +1,8 @@ AC_INIT(configure.in) WITH_CCOPTS -WITH_CPPOPTS dnl since we're not doing CONFIG_RULES -WITH_CC dnl since we're not doing CONFIG_RULES -dnl CONFIG_RULES +CONFIG_RULES AC_SET_BUILDTOP +V5_SHARED_LIB_OBJS SubdirLibraryRule([${OBJS}]) KRB_INCLUDE V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 8319cfe7a..276d92d78 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,7 @@ +Fri May 26 20:19:26 1995 Theodore Y. Ts'o (tytso@dcl) + + * configure.in, Makefile.in: Add support for building shared libraries. + Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) * ccbase.c: removed unneeded INTERFACE from non-api functions. diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in index 6b73fcd57..4ac77d566 100644 --- a/src/lib/krb5/ccache/Makefile.in +++ b/src/lib/krb5/ccache/Makefile.in @@ -4,6 +4,10 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)$(S)file -I$(srcdir)$(S)stdio ##DOSLIBNAME=..\krb5.lib ##DOS!include $(BUILDTOP)\config\windows.in +.c.o: + $(CC) $(CFLAGS) -c $(srcdir)/$*.c +@SHARED_RULE@ + OBJS= ccbase.$(OBJEXT) \ ccdefault.$(OBJEXT) \ ccdefops.$(OBJEXT) @@ -12,19 +16,25 @@ SRCS= $(srcdir)/ccbase.c \ $(srcdir)/ccdefault.c \ $(srcdir)/ccdefops.c -all:: $(OBJS) all-$(WHAT) +all:: all-$(WHAT) + +all-unix:: shared $(OBJS) -all-unix:: -all-mac:: -all-windows:: +all-mac:: $(OBJS) +all-windows:: $(OBJS) cd FILE @echo Making in ccache\file -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) cd .. +shared: + mkdir shared + clean:: clean-$(WHAT) clean-unix:: + $(RM) shared/* + clean-mac: clean-windows:: cd FILE diff --git a/src/lib/krb5/ccache/configure.in b/src/lib/krb5/ccache/configure.in index 844cec50f..0d5f6be0c 100644 --- a/src/lib/krb5/ccache/configure.in +++ b/src/lib/krb5/ccache/configure.in @@ -8,6 +8,7 @@ AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) +V5_SHARED_LIB_OBJS SubdirLibraryRule([$(OBJS)]) KRB_INCLUDE V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog index 5a0286b4b..aa32294d7 100644 --- a/src/lib/krb5/ccache/file/ChangeLog +++ b/src/lib/krb5/ccache/file/ChangeLog @@ -1,3 +1,7 @@ +Fri May 26 20:19:39 1995 Theodore Y. Ts'o (tytso@dcl) + + * configure.in, Makefile.in: Add support for building shared libraries. + Thu May 25 15:37:39 1995 Keith Vetter (keithv@fusion.com) * fcc_maybe.c: the NEED_SOCKETS has to be before the #include line. diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in index e5548cad6..d0f1d78bd 100644 --- a/src/lib/krb5/ccache/file/Makefile.in +++ b/src/lib/krb5/ccache/file/Makefile.in @@ -4,6 +4,10 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSLIBNAME=..\..\krb5.lib ##DOS!include $(BUILDTOP)\config\windows.in +.c.o: + $(CC) $(CFLAGS) -c $(srcdir)/$*.c +@SHARED_RULE@ + OBJS = fcc_close.$(OBJEXT) fcc_destry.$(OBJEXT) fcc_eseq.$(OBJEXT) \ fcc_gennew.$(OBJEXT) fcc_getnam.$(OBJEXT) fcc_gprin.$(OBJEXT) \ fcc_init.$(OBJEXT) fcc_nseq.$(OBJEXT) fcc_read.$(OBJEXT) \ @@ -20,5 +24,19 @@ SRCS = $(srcdir)/fcc_close.c $(srcdir)/fcc_destry.c $(srcdir)/fcc_eseq.c \ $(srcdir)/fcc_write.c $(srcdir)/fcc_sflags.c $(srcdir)/fcc_defops.c \ $(srcdir)/fcc_errs.c $(srcdir)/fcc_maybe.c -all:: $(OBJS) +all:: all-$(WHAT) + +all-unix:: shared $(OBJS) +all-mac:: $(OBJS) +all-windows:: $(OBJS) + +shared: + mkdir shared + +clean:: clean-$(WHAT) + +clean-unix:: + $(RM) shared/* +clean-mac:: +clean-windows:: diff --git a/src/lib/krb5/ccache/file/configure.in b/src/lib/krb5/ccache/file/configure.in index 4be72e1d2..1d1e9ded9 100644 --- a/src/lib/krb5/ccache/file/configure.in +++ b/src/lib/krb5/ccache/file/configure.in @@ -4,6 +4,7 @@ AC_SET_BUILDTOP CONFIG_RULES AC_HAVE_HEADERS(unistd.h) AC_FUNC_CHECK(flock,AC_DEFINE(HAVE_FLOCK)) +V5_SHARED_LIB_OBJS SubdirLibraryRule([${OBJS}]) KRB_INCLUDE V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/ccache/stdio/ChangeLog b/src/lib/krb5/ccache/stdio/ChangeLog index f6f311ffc..df548a71a 100644 --- a/src/lib/krb5/ccache/stdio/ChangeLog +++ b/src/lib/krb5/ccache/stdio/ChangeLog @@ -1,3 +1,7 @@ +Fri May 26 20:19:49 1995 Theodore Y. Ts'o (tytso@dcl) + + * configure.in, Makefile.in: Add support for building shared libraries. + Thu Apr 13 16:32:12 1995 Keith Vetter (keithv@fusion.com) * scc_genn.c: __STDC__ conditional also checks the _WINDOWS define. diff --git a/src/lib/krb5/ccache/stdio/Makefile.in b/src/lib/krb5/ccache/stdio/Makefile.in index 67d926680..89eca23f7 100644 --- a/src/lib/krb5/ccache/stdio/Makefile.in +++ b/src/lib/krb5/ccache/stdio/Makefile.in @@ -1,5 +1,9 @@ CFLAGS = $(CCOPTS) $(DEFS) +.c.o: + $(CC) $(CFLAGS) -c $(srcdir)/$*.c +@SHARED_RULE@ + OBJS = scc_close.o scc_destry.o scc_eseq.o \ scc_gennew.o scc_getnam.o scc_gprin.o scc_init.o \ scc_nseq.o scc_read.o scc_reslv.o scc_retrv.o \ @@ -15,8 +19,24 @@ SRCS = $(srcdir)/scc_close.c $(srcdir)/scc_destry.c $(srcdir)/scc_eseq.c \ $(srcdir)/scc_errs.c $(srcdir)/scc_maybe.c -all:: $(OBJS) +all:: all-$(WHAT) + +all-unix:: shared $(OBJS) +all-mac:: $(OBJS) +all-windows:: $(OBJS) test: ${OBJS} scc_test.o ${CC} -o test ${OBJS} scc_test.o +shared: + mkdir shared + +clean:: clean-$(WHAT) + +clean-unix:: + $(RM) shared/* + +clean-mac:: +clean-windows:: + + diff --git a/src/lib/krb5/ccache/stdio/configure.in b/src/lib/krb5/ccache/stdio/configure.in index f5e1ec7be..872efe65f 100644 --- a/src/lib/krb5/ccache/stdio/configure.in +++ b/src/lib/krb5/ccache/stdio/configure.in @@ -2,6 +2,7 @@ AC_INIT(configure.in) WITH_CCOPTS AC_SET_BUILDTOP CONFIG_RULES +V5_SHARED_LIB_OBJS SubdirLibraryRule([${OBJS}]) KRB_INCLUDE V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in index 9ef1fe2bc..b884e9b74 100644 --- a/src/lib/krb5/configure.in +++ b/src/lib/krb5/configure.in @@ -11,5 +11,6 @@ AC_PROG_INSTALL MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) MAKE_SUBDIRS("checking",check) -AppendRule([all:: libkrb5.a libkrb5_ranlib]) +AppendRule([all:: libkrb5.a]) +V5_MAKE_SHARED_LIB(libkrb5) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog index f94005a35..a39a70eba 100644 --- a/src/lib/krb5/error_tables/ChangeLog +++ b/src/lib/krb5/error_tables/ChangeLog @@ -1,3 +1,7 @@ +Fri May 26 20:19:59 1995 Theodore Y. Ts'o (tytso@dcl) + + * configure.in, Makefile.in: Add support for building shared libraries. + Tue May 23 16:46:30 1995 Theodore Y. Ts'o (tytso@dcl) * Makefile.in: Don't install the error table header files; they diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in index ed95b9bd7..aab8b37b2 100644 --- a/src/lib/krb5/error_tables/Makefile.in +++ b/src/lib/krb5/error_tables/Makefile.in @@ -18,6 +18,10 @@ EHDRDIR=$(BUILDTOP)$(S)include$(S)krb5 #SRCTOP2 = $(BUILDTOP2) #EHDRDIR2=$(BUILDTOP2)/include/krb5 +.c.o: + $(CC) $(CFLAGS) -c $*.c +@SHARED_RULE_LOCAL@ + HDRS= asn1_err.h kdb5_err.h krb5_err.h kv5m_err.h adm_err.h OBJS= asn1_err.$(OBJEXT) kdb5_err.$(OBJEXT) krb5_err.$(OBJEXT) \ kv5m_err.$(OBJEXT) adm_err.$(OBJEXT) init_ets.$(OBJEXT) @@ -26,11 +30,14 @@ SRCS=$(ETSRCS) init_ets.c all:: all-$(WHAT) -all-unix:: $(HDRS) includes $(OBJS) +all-unix:: $(HDRS) includes shared $(OBJS) all-mac:: $(OBJS) all-windows:: $(OBJS) +shared: + mkdir shared + unixmac: $(HDRS) includes $(SRCS) awk-windows: @@ -63,11 +70,14 @@ kv5m_err.$(OBJEXT): kv5m_err.c clean:: clean-$(WHAT) clean-unix:: clean-hdrs - $(RM) $(HDRS) $(ETSRCS) + $(RM) $(HDRS) $(ETSRCS) shared/* clean-mac:: clean-hdrs $(RM) $(HDRS) $(ETSRCS) clean-windows:: +init_ets.o: $(srcdir)/init_ets.c + $(CC) $(CFLAGS) -c $(srcdir)/$*.c +@SHARED_RULE@ includes:: $(HDRS) for x in $(HDRS); do \ diff --git a/src/lib/krb5/error_tables/configure.in b/src/lib/krb5/error_tables/configure.in index 38dbe033c..66ebddd5f 100644 --- a/src/lib/krb5/error_tables/configure.in +++ b/src/lib/krb5/error_tables/configure.in @@ -5,5 +5,6 @@ AC_SET_BUILDTOP ET_RULES SS_RULES KRB_INCLUDE +V5_SHARED_LIB_OBJS SubdirLibraryRule([${OBJS}]) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/free/ChangeLog b/src/lib/krb5/free/ChangeLog index 6f444bb60..2bb9a84fe 100644 --- a/src/lib/krb5/free/ChangeLog +++ b/src/lib/krb5/free/ChangeLog @@ -1,3 +1,7 @@ +Fri May 26 20:20:10 1995 Theodore Y. Ts'o (tytso@dcl) + + * configure.in, Makefile.in: Add support for building shared libraries. + Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) * *.[ch]: removed unneeded INTERFACE from non-api functions. diff --git a/src/lib/krb5/free/Makefile.in b/src/lib/krb5/free/Makefile.in index 603a9b1c7..9d3ed5494 100644 --- a/src/lib/krb5/free/Makefile.in +++ b/src/lib/krb5/free/Makefile.in @@ -4,6 +4,10 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSLIBNAME=..\krb5.lib ##DOS!include $(BUILDTOP)\config\windows.in +.c.o: + $(CC) $(CFLAGS) -c $(srcdir)/$*.c +@SHARED_RULE@ + OBJS= \ f_addr.$(OBJEXT) \ f_address.$(OBJEXT) \ @@ -70,5 +74,21 @@ SRCS= \ $(srcdir)/f_cred.c \ $(srcdir)/f_cred_enc.c -all:: $(OBJS) +all:: all-$(WHAT) + +all-unix:: shared $(OBJS) +all-mac:: $(OBJS) +all-windows:: $(OBJS) + +shared: + mkdir shared + +clean:: clean-$(WHAT) + +clean-unix:: + $(RM) shared/* + +clean-mac:: +clean-windows:: + diff --git a/src/lib/krb5/free/configure.in b/src/lib/krb5/free/configure.in index f5e1ec7be..872efe65f 100644 --- a/src/lib/krb5/free/configure.in +++ b/src/lib/krb5/free/configure.in @@ -2,6 +2,7 @@ AC_INIT(configure.in) WITH_CCOPTS AC_SET_BUILDTOP CONFIG_RULES +V5_SHARED_LIB_OBJS SubdirLibraryRule([${OBJS}]) KRB_INCLUDE V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog index 97ee383e0..266289190 100644 --- a/src/lib/krb5/keytab/ChangeLog +++ b/src/lib/krb5/keytab/ChangeLog @@ -1,3 +1,7 @@ +Fri May 26 20:20:18 1995 Theodore Y. Ts'o (tytso@dcl) + + * configure.in, Makefile.in: Add support for building shared libraries. + Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) * *.c: removed unneeded INTERFACE from non-api functions. diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in index 357a62027..d9a5a4941 100644 --- a/src/lib/krb5/keytab/Makefile.in +++ b/src/lib/krb5/keytab/Makefile.in @@ -4,6 +4,10 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSLIBNAME=..\krb5.lib ##DOS!include $(BUILDTOP)\config\windows.in +.c.o: + $(CC) $(CFLAGS) -c $(srcdir)/$*.c +@SHARED_RULE@ + OBJS= \ ktadd.$(OBJEXT) \ ktbase.$(OBJEXT) \ @@ -20,11 +24,14 @@ SRCS= \ $(srcdir)/ktremove.c \ $(srcdir)/read_servi.c -all:: $(OBJS) all-$(WHAT) +all:: all-$(WHAT) + +shared: + mkdir shared -all-unix:: -all-mac:: -all-windows:: +all-unix:: shared $(OBJS) +all-mac:: $(OBJS) +all-windows:: $(OBJS) cd file @echo Making in keytab\file -$(MAKE) -$(MFLAGS) LIBCMD=$(LIBCMD) @@ -33,6 +40,8 @@ all-windows:: clean:: clean-$(WHAT) clean-unix:: + $(RM) shared/* + clean-mac:: clean-windows:: cd file diff --git a/src/lib/krb5/keytab/configure.in b/src/lib/krb5/keytab/configure.in index 0c1058300..07ab2ac87 100644 --- a/src/lib/krb5/keytab/configure.in +++ b/src/lib/krb5/keytab/configure.in @@ -8,6 +8,7 @@ AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB MAKE_SUBDIRS("making",all) MAKE_SUBDIRS("cleaning",clean) +V5_SHARED_LIB_OBJS SubdirLibraryRule([$(OBJS)]) KRB_INCLUDE V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog index 47da64df3..96953c45c 100644 --- a/src/lib/krb5/keytab/file/ChangeLog +++ b/src/lib/krb5/keytab/file/ChangeLog @@ -1,3 +1,7 @@ +Fri May 26 20:20:29 1995 Theodore Y. Ts'o (tytso@dcl) + + * configure.in, Makefile.in: Add support for building shared libraries. + Thu Apr 13 15:49:16 1995 Keith Vetter (keithv@fusion.com) * *.[ch]: removed unneeded INTERFACE from non-api functions. diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in index a35d54c0e..39e2af5f3 100644 --- a/src/lib/krb5/keytab/file/Makefile.in +++ b/src/lib/krb5/keytab/file/Makefile.in @@ -4,6 +4,10 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSLIBNAME=..\..\krb5.lib ##DOS!include $(BUILDTOP)\config\windows.in +.c.o: + $(CC) $(CFLAGS) -c $(srcdir)/$*.c +@SHARED_RULE@ + SRCS= \ $(srcdir)/ktf_add.c \ $(srcdir)/ktf_endget.c \ @@ -36,4 +40,19 @@ OBJS = \ ktf_wreslv.$(OBJEXT) \ ktf_defops.$(OBJEXT) -all:: $(OBJS) +all:: all-$(WHAT) + +all-unix:: shared $(OBJS) +all-mac:: $(OBJS) +all-windows:: $(OBJS) + +shared: + mkdir shared + +clean:: clean-$(WHAT) + +clean-unix:: + $(RM) shared/* + +clean-mac:: +clean-windows:: diff --git a/src/lib/krb5/keytab/file/configure.in b/src/lib/krb5/keytab/file/configure.in index f5e1ec7be..872efe65f 100644 --- a/src/lib/krb5/keytab/file/configure.in +++ b/src/lib/krb5/keytab/file/configure.in @@ -2,6 +2,7 @@ AC_INIT(configure.in) WITH_CCOPTS AC_SET_BUILDTOP CONFIG_RULES +V5_SHARED_LIB_OBJS SubdirLibraryRule([${OBJS}]) KRB_INCLUDE V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index a659b80f4..6eae4dd04 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,7 @@ +Fri May 26 20:20:58 1995 Theodore Y. Ts'o (tytso@dcl) + + * configure.in, Makefile.in: Add support for building shared libraries. + Thu May 25 15:33:45 1995 Keith Vetter (keithv@fusion.com) * os-proto.h: moved prototype for krb5_make_fulladdr to diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in index 83013f2fe..810a9574e 100644 --- a/src/lib/krb5/os/Makefile.in +++ b/src/lib/krb5/os/Makefile.in @@ -4,6 +4,10 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSLIBNAME=..\krb5.lib ##DOS!include $(BUILDTOP)\config\windows.in +.c.o: + $(CC) $(CFLAGS) -c $(srcdir)/$*.c +@SHARED_RULE@ + OBJS= \ an_to_ln.$(OBJEXT) \ def_realm.$(OBJEXT) \ @@ -78,7 +82,16 @@ SRCS= \ $(srcdir)/ustime.c \ $(srcdir)/write_msg.c -all:: $(OBJS) +all:: all-$(WHAT) + +all-unix:: shared $(OBJS) + +all-mac:: $(OBJS) + +all-windows:: $(OBJS) + +shared: + mkdir shared COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a @@ -103,5 +116,11 @@ check-unix:: $(TEST_PROGS) cmp test.out $(srcdir)/ref_std_conf.out $(RM) test.out -clean:: +clean:: clean-$(WHAT) $(RM) $(TEST_PROGS) test.out t_std_conf.o + +clean-unix:: + $(RM) shared/* +clean-mac:: +clean-windows:: + diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in index 4bac2beb1..dc7d96a3d 100644 --- a/src/lib/krb5/os/configure.in +++ b/src/lib/krb5/os/configure.in @@ -9,6 +9,7 @@ AC_TIME_WITH_SYS_TIME AC_HAVE_HEADERS(unistd.h sys/time.h) AC_HEADER_EGREP(time_t, sys/types.h, AC_DEFINE(POSIX_TYPES)) HAS_ANSI_VOLATILE +V5_SHARED_LIB_OBJS SubdirLibraryRule([${OBJS}]) KRB_INCLUDE V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog index 1a7d318e4..8c929e3d5 100644 --- a/src/lib/krb5/posix/ChangeLog +++ b/src/lib/krb5/posix/ChangeLog @@ -1,3 +1,7 @@ +Fri May 26 20:21:09 1995 Theodore Y. Ts'o (tytso@dcl) + + * configure.in, Makefile.in: Add support for building shared libraries. + Tue May 23 16:30:03 1995 Theodore Y. Ts'o (tytso@dcl) * daemon.c: Rearrange #include files so that krb5.h gets included diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in index 099bdcee9..65ba48e28 100644 --- a/src/lib/krb5/posix/Makefile.in +++ b/src/lib/krb5/posix/Makefile.in @@ -4,10 +4,27 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSLIBNAME=..\krb5.lib ##DOS!include $(BUILDTOP)\config\windows.in +.c.o: + $(CC) $(CFLAGS) -c $(srcdir)/$*.c +@SHARED_RULE@ + OBJS = @LIBOBJS@ all:: all-$(WHAT) -all-unix:: $(OBJS) +all-unix:: shared $(OBJS) all-mac: $(OBJS) all-windows:: syslog.obj + +shared: + mkdir shared + +clean:: clean-$(WHAT) + +clean-unix:: + $(RM) shared/* + +clean-mac:: +clean-windows:: + + diff --git a/src/lib/krb5/posix/configure.in b/src/lib/krb5/posix/configure.in index 9cf88f3ef..c7593b028 100644 --- a/src/lib/krb5/posix/configure.in +++ b/src/lib/krb5/posix/configure.in @@ -3,6 +3,7 @@ WITH_CCOPTS AC_SET_BUILDTOP CONFIG_RULES SubdirLibraryRule([${OBJS}]) +V5_SHARED_LIB_OBJS KRB_INCLUDE AC_CONST AC_HEADER_CHECK(paths.h,AC_DEFINE(HAS_PATHS_H)) diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog index 585ca17f6..5fee54bb4 100644 --- a/src/lib/krb5/rcache/ChangeLog +++ b/src/lib/krb5/rcache/ChangeLog @@ -1,3 +1,7 @@ +Fri May 26 20:21:19 1995 Theodore Y. Ts'o (tytso@dcl) + + * configure.in, Makefile.in: Add support for building shared libraries. + Tue May 23 16:30:29 1995 Theodore Y. Ts'o (tytso@dcl) * rc_io.c: Rearrange #include files so that krb5.h gets included diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in index 97a86535f..e5ab7a3e3 100644 --- a/src/lib/krb5/rcache/Makefile.in +++ b/src/lib/krb5/rcache/Makefile.in @@ -4,6 +4,10 @@ CFLAGS = $(CCOPTS) $(DEFS) ##DOSLIBNAME=..\krb5.lib ##DOS!include $(BUILDTOP)\config\windows.in +.c.o: + $(CC) $(CFLAGS) -c $(srcdir)/$*.c +@SHARED_RULE@ + OBJS= \ rc_base.$(OBJEXT) \ rc_dfl.$(OBJEXT) \ @@ -18,4 +22,19 @@ SRCS= \ $(srcdir)/rcdef.c \ $(srcdir)/rc_conv.c -all:: $(OBJS) +all:: all-$(WHAT) + +all-unix:: shared $(OBJS) +all-mac:: $(OBJS) +all-windows:: $(OBJS) + +shared: + mkdir shared + +clean:: clean-$(WHAT) + +clean-mac:: +clean-windows:: + +clean-unix:: + $(RM) shared/* diff --git a/src/lib/krb5/rcache/configure.in b/src/lib/krb5/rcache/configure.in index 7003035a1..209209d01 100644 --- a/src/lib/krb5/rcache/configure.in +++ b/src/lib/krb5/rcache/configure.in @@ -2,6 +2,7 @@ AC_INIT(configure.in) WITH_CCOPTS AC_SET_BUILDTOP CONFIG_RULES +V5_SHARED_LIB_OBJS SubdirLibraryRule([${OBJS}]) KRB_INCLUDE AC_TYPE_UID_T diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog index c76957e57..7935002d6 100644 --- a/src/util/profile/ChangeLog +++ b/src/util/profile/ChangeLog @@ -1,6 +1,6 @@ Fri May 26 20:07:13 1995 Theodore Y. Ts'o (tytso@dcl) - * configure.in, Makefile.in: Add support for shared libraries. + * configure.in, Makefile.in: Add support for building shared libraries. Sat May 6 17:21:59 1995 Ezra Peisach