opr: Convert to using libtool

Convert opr so that it uses libtool. For backwards compatibility we
still build libopr.a, but we do so as a static convenience library.

As libopr.a may, in the future, be converted to an LWP library, change
all of the pthreaded binaries so that they link against the libtool
library liboafs_opr.la

Change-Id: Icee04ff4745334f06ffba16df5bb07fc9dcc0b54
Reviewed-on: http://gerrit.openafs.org/8034
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: Derrick Brashear <shadow@dementix.org>

diff --git a/configure.ac b/configure.ac
index 5cbf591..4537c25 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,7 @@ AC_USE_SYSTEM_EXTENSIONS
 LT_INIT
 
 AC_PROG_CC
+AC_PROG_LIBTOOL
 
 AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib])
 AC_SUBST([PATH_CPP])

diff --git a/regen.sh b/regen.sh
index 0908683..295ca8c 100755 (executable)
--- a/regen.sh
+++ b/regen.sh
@@ -15,6 +15,10 @@ do
 done
 
 echo "Updating configuration..."
+
+echo "Running libtoolize"
+libtoolize -c -f
+
 echo "Running aclocal"
 if which aclocal > /dev/null 2>&1; then
   aclocal -I src/cf -I src/external/rra-c-util/m4
@@ -25,8 +29,6 @@ else
   exit 1
 fi
 
-echo "Running libtoolize"
-libtoolize -c -f
 echo "Running autoconf"
 autoconf
 echo "Running autoconf for configure-libafs"

diff --git a/src/afsd/Makefile.in b/src/afsd/Makefile.in
index a7e66ab..517205c 100644 (file)
--- a/src/afsd/Makefile.in
+++ b/src/afsd/Makefile.in
@@ -25,20 +25,24 @@ AFSLIBS=${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/libafsutil.a \
        ${TOP_LIBDIR}/libafsrpc.a \
-       $(TOP_LIBDIR)/libopr.a
+       $(top_builddir)/src/opr/liboafs_opr.la
 
-UAFSLIBS=${TOP_LIBDIR}/libuafs.a ${TOP_LIBDIR}/libafsutil.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/libafsutil.a ${TOP_LIBDIR}/libopr.a
+UAFSLIBS=${TOP_LIBDIR}/libuafs.a \
+        ${TOP_LIBDIR}/libafsutil.a \
+        ${TOP_LIBDIR}/libcmd.a \
+        ${TOP_LIBDIR}/libafsutil.a \
+        $(top_builddir)/src/opr/liboafs_opr.la
 
 FUSE_LIBS=@FUSE_LIBS@
 
 LDFLAGS_afsd = $(AFSD_LDFLAGS)
 afsd: afsd.o afsd_kernel.o $(AFSLIBS) $(AFSD_LIBS)
-       ${AFS_LDRULE} afsd.o afsd_kernel.o $(NON_SHARED) \
+       $(LT_LDRULE_static) afsd.o afsd_kernel.o $(NON_SHARED) \
                $(AFSLIBS) ${AFSD_LIBS} $(LIB_roken) $(MT_LIBS) $(XLIBS)
 
 LDFLAGS_afsd.fuse = $(AFSD_LDFLAGS)
 afsd.fuse: afsd_fuse.o $(UAFSLIBS) $(AFSD_LIBS)
-       ${AFS_LDRULE} afsd_fuse.o $(NON_SHARED) \
+       $(LT_LDRULE_static) afsd_fuse.o $(NON_SHARED) \
                $(UAFSLIBS) $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS) $(LIB_crypt) \
                ${XLIBS} ${FUSE_LIBS} ${AFSD_LIBS}
 

diff --git a/src/aklog/Makefile.in b/src/aklog/Makefile.in
index af5dfb5..7656eb8 100644 (file)
--- a/src/aklog/Makefile.in
+++ b/src/aklog/Makefile.in
@@ -14,7 +14,7 @@ AFSLIBS= ${TOP_LIBDIR}/libafsauthent.a \
          ${TOP_LIBDIR}/libafsrpc.a \
         ${TOP_LIBDIR}/libafshcrypto.a \
         ${TOP_LIBDIR}/libcmd.a \
-        ${TOP_LIBDIR}/libopr.a \
+        $(top_builddir)/src/opr/liboafs_opr.la \
          ${TOP_LIBDIR}/util.a
 
 SRCS=  aklog.c krb_util.c linked_list.c
@@ -23,13 +23,13 @@ OBJS=   aklog.o krb_util.o linked_list.o
 all: aklog asetkey klog
 
 aklog: ${OBJS} ${AFSLIBS}
-       $(AFS_LDRULE) ${OBJS} ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${MT_LIBS}
+       $(LT_LDRULE_static) ${OBJS} ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${MT_LIBS}
 
 asetkey: asetkey.o ${AFSLIBS}
-       $(AFS_LDRULE) asetkey.o ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${MT_LIBS}
+       $(LT_LDRULE_static) asetkey.o ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${MT_LIBS}
 
 klog:  klog.o skipwrap.o ${AFSLIBS}
-       $(AFS_LDRULE) klog.o skipwrap.o \
+       $(LT_LDRULE_static) klog.o skipwrap.o \
                ${AKLIBS} ${AFSLIBS} $(LIB_roken) ${MT_LIBS}
 
 #
@@ -37,10 +37,10 @@ klog:       klog.o skipwrap.o ${AFSLIBS}
 #
 install: aklog asetkey klog
        ${INSTALL} -d ${DESTDIR}${bindir}
-       ${INSTALL_PROGRAM} aklog ${DESTDIR}${bindir}/aklog
-       ${INSTALL_PROGRAM} klog ${DESTDIR}${bindir}/klog.krb5
+       ${LT_INSTALL_PROGRAM} aklog ${DESTDIR}${bindir}/aklog
+       ${LT_INSTALL_PROGRAM} klog ${DESTDIR}${bindir}/klog.krb5
        ${INSTALL} -d ${DESTDIR}${afssrvbindir}
-       ${INSTALL_PROGRAM} asetkey ${DESTDIR}${afssrvbindir}/asetkey 
+       ${LT_INSTALL_PROGRAM} asetkey ${DESTDIR}${afssrvbindir}/asetkey
 
 dest: aklog asetkey klog
        ${INSTALL} -d ${DEST}/bin
@@ -53,6 +53,7 @@ dest: aklog asetkey klog
 # Misc. targets
 #
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o ${OBJS} aklog asetkey klog
 
 include ../config/Makefile.version

diff --git a/src/dviced/Makefile.in b/src/dviced/Makefile.in
index b4246d4..e01902b 100644 (file)
--- a/src/dviced/Makefile.in
+++ b/src/dviced/Makefile.in
@@ -50,12 +50,12 @@ objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
         ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${RXOBJS}
 
 SDBGOBJS = state_analyzer.o uuid.o dirpath.o fileutil.o ${TOP_LIBDIR}/util.a \
-          ${TOP_LIBDIR}/libopr.a
+          $(top_builddir)/src/opr/liboafs_opr.la
 
 LIBS=${TOP_LIBDIR}/libafsauthent.a \
      ${TOP_LIBDIR}/libafsrpc.a \
      $(TOP_LIBDIR)/libcmd.a \
-     ${TOP_LIBDIR}/libopr.a \
+     $(top_builddir)/src/opr/liboafs_opr.la \
      ${TOP_LIBDIR}/util.a
 
 all: dafileserver state_analyzer
@@ -211,17 +211,17 @@ state_analyzer.o: ${VICED}/state_analyzer.c
        $(AFS_CCRULE) $(VICED)/state_analyzer.c
 
 dafileserver: ${objects} ${LIBS}
-       $(AFS_LDRULE) ${objects} \
+       $(LT_LDRULE_static) ${objects} \
                ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 state_analyzer: ${SDBGOBJS}
-       $(AFS_LDRULE) ${SDBGOBJS} \
+       $(LT_LDRULE_static) ${SDBGOBJS} \
                $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 install: dafileserver state_analyzer
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
        ${INSTALL} -d ${DESTDIR}${afssrvsbindir}
-       ${INSTALL} dafileserver \
+       $(LT_INSTALL_PROGRAM) dafileserver \
                ${DESTDIR}${afssrvlibexecdir}/dafileserver
        ${INSTALL_PROGRAM} state_analyzer \
                ${DESTDIR}${afssrvsbindir}/state_analyzer
@@ -234,6 +234,7 @@ dest: dafileserver state_analyzer
                ${DEST}/root.server/usr/afs/bin/state_analyzer
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o dafileserver state_analyzer core AFS_component_version_number.c
 
 include ../config/Makefile.version

diff --git a/src/dvolser/Makefile.in b/src/dvolser/Makefile.in
index e35123e..872e7f3 100644 (file)
--- a/src/dvolser/Makefile.in
+++ b/src/dvolser/Makefile.in
@@ -47,7 +47,7 @@ LIBS= ${TOP_LIBDIR}/libcmd.a          \
        ${TOP_LIBDIR}/libafsauthent.a   \
        ${TOP_LIBDIR}/libafsrpc.a       \
        ${TOP_LIBDIR}/libafsutil.a      \
-       ${TOP_LIBDIR}/libopr.a          \
+       $(top_builddir)/src/opr/liboafs_opr.la \
        ${TOP_LIBDIR}/libusd.a
 
 all: davolserver 
@@ -195,18 +195,20 @@ namei_ops.o: ${VOL}/namei_ops.c
        $(AFS_CCRULE) $(VOL)/namei_ops.c
 
 davolserver: ${objects} ${LIBS}
-       $(AFS_LDRULE) ${objects} ${LIBS} $(LIB_hcrypto) $(LIB_roken) \
+       $(LT_LDRULE_static) ${objects} ${LIBS} $(LIB_hcrypto) $(LIB_roken) \
                ${MT_LIBS} ${XLIBS}
 
 install: davolserver
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
-       ${INSTALL} davolserver ${DESTDIR}${afssrvlibexecdir}/davolserver
+       ${LT_INSTALL_PROGRAM} davolserver \
+               ${DESTDIR}${afssrvlibexecdir}/davolserver
 
 dest: davolserver
        ${INSTALL} -d ${DEST}/root.server/usr/afs/bin
        ${INSTALL} davolserver ${DEST}/root.server/usr/afs/bin/davolserver
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o davolserver core AFS_component_version_number.c
 
 include ../config/Makefile.version

diff --git a/src/libadmin/samples/Makefile.in b/src/libadmin/samples/Makefile.in
index a31ece0..134e847 100644 (file)
--- a/src/libadmin/samples/Makefile.in
+++ b/src/libadmin/samples/Makefile.in
@@ -9,6 +9,7 @@ srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 include @TOP_OBJDIR@/src/config/Makefile.pthread
 
+top_builddir=@TOP_OBJDIR@
 
 SAMPLEPROGS=\
        cm_client_config \
@@ -41,93 +42,93 @@ SAMPLELIBS =\
        ${TOP_LIBDIR}/libafsauthent.a \
        ${TOP_LIBDIR}/libafsrpc.a \
        $(TOP_LIBDIR)/libafsutil.a \
-       $(TOP_LIBDIR)/libopr.a \
+       $(top_builddir)/src/opr/liboafs_opr.la \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
 all test tests: $(SAMPLEPROGS)
 
 cm_client_config: cm_client_config.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 cm_list_cells: cm_list_cells.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 cm_local_cell: cm_local_cell.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 cm_server_prefs: cm_server_prefs.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxdebug_basic_stats: rxdebug_basic_stats.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxdebug_conns: rxdebug_conns.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxdebug_peers: rxdebug_peers.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxdebug_rx_stats: rxdebug_rx_stats.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxdebug_supported_stats: rxdebug_supported_stats.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxdebug_version: rxdebug_version.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxstat_clear_peer: rxstat_clear_peer.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxstat_clear_process: rxstat_clear_process.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxstat_disable_peer: rxstat_disable_peer.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxstat_disable_process: rxstat_disable_process.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxstat_enable_peer: rxstat_enable_peer.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxstat_enable_process: rxstat_enable_process.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxstat_get_peer: rxstat_get_peer.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxstat_get_process: rxstat_get_process.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxstat_get_version: rxstat_get_version.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxstat_query_peer: rxstat_query_peer.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 rxstat_query_process: rxstat_query_process.o $(SAMPLELIBS)
-       $(AFS_LDRULE) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
+       $(LT_LDRULE_static) $@.o $(SAMPLELIBS) $(LIB_roken) $(LIB_crypt) \
                $(MT_LIBS) $(XLIBS)
 
 #
@@ -143,5 +144,6 @@ install:
 dest:
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o $(SAMPLEPROGS) core
 

diff --git a/src/libadmin/test/Makefile.in b/src/libadmin/test/Makefile.in
index 241d952..eb97854 100644 (file)
--- a/src/libadmin/test/Makefile.in
+++ b/src/libadmin/test/Makefile.in
@@ -8,7 +8,7 @@
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
 include @TOP_OBJDIR@/src/config/Makefile.pthread
-
+top_builddir=@TOP_OBJDIR@
 
 ########################################################################
 # build tests
@@ -23,7 +23,7 @@ AFSCPLIBS =\
        $(TOP_LIBDIR)/libafsauthent.a \
        $(TOP_LIBDIR)/libafsrpc.a \
        $(TOP_LIBDIR)/libcmd.a \
-       $(TOP_LIBDIR)/libopr.a \
+       $(top_builddir)/src/opr/liboafs_opr.la \
        $(TOP_LIBDIR)/libafsutil.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
@@ -40,7 +40,7 @@ all test tests: afscp
 CFLAGS_client.o = @CFLAGS_NOERROR@
 
 afscp: afscp.o $(AFSCPOBJS) $(AFSCPLIBS)
-       $(AFS_LDRULE) afscp.o $(AFSCPOBJS) $(AFSCPLIBS) \
+       $(LT_LDRULE_static) afscp.o $(AFSCPOBJS) $(AFSCPLIBS) \
                $(LIB_roken) $(LIB_crypt) ${MT_LIBS} $(XLIBS)
 
 #######################################################################
@@ -49,4 +49,5 @@ install:
 dest:
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o afscp core

diff --git a/src/opr/Makefile.in b/src/opr/Makefile.in
index 11af649..af37167 100644 (file)
--- a/src/opr/Makefile.in
+++ b/src/opr/Makefile.in
@@ -1,8 +1,9 @@
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
-include @TOP_OBJDIR@/src/config/Makefile.shared
+include @TOP_OBJDIR@/src/config/Makefile.libtool
+include @TOP_OBJDIR@/src/config/Makefile.pthread
 
-objects = assert.o casestrcpy.o rbtree.o uuid.o
+LT_objs = assert.lo casestrcpy.lo rbtree.lo uuid.lo
 
 HEADERS = $(TOP_INCDIR)/afs/opr.h \
          $(TOP_INCDIR)/afs/opr_assert.h \
@@ -12,16 +13,24 @@ HEADERS = $(TOP_INCDIR)/afs/opr.h \
          $(TOP_INCDIR)/opr/time.h \
          $(TOP_INCDIR)/opr/uuid.h
 
-all: $(HEADERS) $(TOP_LIBDIR)/libopr.a
+all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a
 
-libopr.a: $(objects)
-       -$(RM) -f $@
-       $(AR) crv $@ $(objects)
-       $(RANLIB) $@
+liboafs_opr.la: $(LT_objs) $(LT_deps)
+       $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
+
+libopr.a: $(LT_objs)
+       $(LT_LDLIB_static) $(LT_objs)
+
+libopr_pic.a: $(LT_objs)
+       $(LT_LDLIB_pic) $(LT_objs)
 
 $(TOP_LIBDIR)/libopr.a: libopr.a
        $(INSTALL_DATA) libopr.a $@
 
+$(TOP_LIBDIR)/libopr_pic.a: libopr.a
+       $(INSTALL_DATA) libopr.a $@
+
+
 $(TOP_INCDIR)/afs/opr.h: opr.h
        $(INSTALL_DATA) $? $@
 
@@ -44,9 +53,11 @@ $(TOP_INCDIR)/opr/uuid.h: ${srcdir}/uuid.h
        $(INSTALL_DATA) $? $@
 
 clean:
-       rm -f $(objects) libopr.a
+       $(LT_CLEAN)
+       rm -f libopr.a
 
 install: libopr.a
+       $(LT_INSTALL_DATA) liboafs_opr.la $(DESTDIR)$(libdir)/liboafs_opr.la
        $(INSTALL_DATA) libopr.a $(DESTDIR)$(libdir)/libopr.a
        $(INSTALL) -d $(DESTDIR)$(includedir)/opr
        $(INSTALL_DATA) ${srcdir}/queue.h $(DESTDIR)$(includedir)/opr/queue.h
@@ -56,6 +67,5 @@ dest: libopr.a
        $(INSTALL) -d $(DEST)/include/opr
        $(INSTALL_DATA) ${srcdir}/queue.h $(DEST)/include/opr/queue.h
 
-
 buildtools: $(HEADERS) $(TOP_LIBDIR)/libopr.a
 

diff --git a/src/opr/liboafs_opr.la.sym b/src/opr/liboafs_opr.la.sym
new file mode 100644 (file)
index 0000000..4e727e0
--- /dev/null
+++ b/src/opr/liboafs_opr.la.sym
@@ -0,0 +1,13 @@
+opr_lcstring
+opr_ucstring
+opr_stolower
+opr_stoupper
+opr_strcompose
+opr_AssertionFailed
+opr_rbtree_first
+opr_rbtree_next
+opr_rbtree_remove
+opr_rbtree_replace
+opr_rbtree_replace
+opr_rbtree_insert
+opr_rbtree_init

diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in
index 6107ff1..8287b5e 100644 (file)
--- a/src/tbudb/Makefile.in
+++ b/src/tbudb/Makefile.in
@@ -44,7 +44,7 @@ LIBS=${RXOBJS} ${UTILOBJS} \
        ${TOP_LIBDIR}/libafsauthent.a \
        ${TOP_LIBDIR}/libafsrpc.a \
        ${TOP_LIBDIR}/libcmd.a \
-       $(TOP_LIBDIR)/libopr.a \
+       $(top_builddir)/src/opr/liboafs_opr.la \
        ${TOP_LIBDIR}/libafsutil.a
 
 COMMON_OBJS = database.o db_alloc.o db_dump.o db_hash.o struct_ops.o ol_verify.o
@@ -136,7 +136,7 @@ server.o: ${BUDB}/server.c budb_errs.h ${INCLS}
        $(AFS_CCRULE) $(BUDB)/server.c
 
 budb_server: $(SERVER_OBJS) ${LIBS}
-       $(AFS_LDRULE) $(SERVER_OBJS) ${LIBS} \
+       $(LT_LDRULE_static) $(SERVER_OBJS) ${LIBS} \
                $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 budb.cs.c: ${BUDB}/budb.rg
@@ -165,7 +165,7 @@ libbudb.a: budb_errs.o budb.cs.o budb.xdr.o struct_ops.o AFS_component_version_n
 #
 install: budb_server
        if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then      \
-           ${INSTALl_PROGRAM} budb_server                      \
+           ${LT_INSTALl_PROGRAM} budb_server                      \
                ${DESTDIR}${afssrvlibexecdir}/buserver;         \
        fi
 
@@ -179,6 +179,7 @@ dest: budb_server
 # Misc targets
 #
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o *~ budb_errs.[ch] budb.h *.a *.xdr.c \
                *.ss.c *.cs.c core budb_server AFS_component_version_number.c
 

diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in
index de86dd1..fc48dc1 100644 (file)
--- a/src/tbutc/Makefile.in
+++ b/src/tbutc/Makefile.in
@@ -57,7 +57,7 @@ BUTCLIBS=${TOP_LIBDIR}/libbudb.a \
            ${TOP_LIBDIR}/libafsrpc.a \
             ${TOP_LIBDIR}/libcmd.a \
            ${TOP_LIBDIR}/util.a \
-           $(TOP_LIBDIR)/libopr.a \
+           $(top_builddir)/src/opr/liboafs_opr.la \
            ${TOP_LIBDIR}/libusd.a \
            ${TOP_LIBDIR}/libprocmgmt.a
 
@@ -68,7 +68,7 @@ BUTCLIBS=${TOP_LIBDIR}/libbudb.a \
 all: butc
 
 butc: ${BUTCOBJS} ${BUTCLIBS}
-       $(AFS_LDRULE) ${BUTCOBJS} ${BUTCLIBS} \
+       $(LT_LDRULE_static) ${BUTCOBJS} ${BUTCLIBS} \
                $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 libbutm.a: ${BUTMOBJS} AFS_component_version_number.o
@@ -139,7 +139,7 @@ file_tm.o: ${BUTM}/file_tm.c ${BUTMINCLS}
 #
 install: butc
        ${INSTALL} -d ${DESTDIR}${sbindir}
-       ${INSTALL_PROGRAM} butc ${DESTDIR}${sbindir}/butc
+       $(LT_INSTALL_PROGRAM) butc ${DESTDIR}${sbindir}/butc
 
 dest: butc
        ${INSTALL} -d ${DEST}/etc
@@ -149,6 +149,7 @@ dest: butc
 # Misc targets
 #
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o *.a core AFS_component_version_number.c butc
 
 include ../config/Makefile.version

diff --git a/src/tools/rxperf/Makefile.in b/src/tools/rxperf/Makefile.in
index ca99430..c8fe95c 100644 (file)
--- a/src/tools/rxperf/Makefile.in
+++ b/src/tools/rxperf/Makefile.in
@@ -1,15 +1,15 @@
 srcdir=@srcdir@
-
 include @TOP_OBJDIR@/src/config/Makefile.config
 include @TOP_OBJDIR@/src/config/Makefile.pthread
+top_builddir=@TOP_OBJDIR@
 
 LIBS= $(TOP_LIBDIR)/libafsrpc.a \
-      $(TOP_LIBDIR)/libopr.a
+      $(top_builddir)/src/opr/liboafs_opr.la
 
 all: rxperf
 
 rxperf: rxperf.o $(LIBS)
-       $(AFS_LDRULE) rxperf.o $(LIBS) $(LIB_hcrypto) $(LIB_roken) \
+       $(LT_LDRULE_static) rxperf.o $(LIBS) $(LIB_hcrypto) $(LIB_roken) \
                $(MT_LIBS) $(XLIBS)
 
 install:
@@ -17,4 +17,5 @@ install:
 dest:
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f rxperf.o rxperf

diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in
index a00fad1..7d02442 100644 (file)
--- a/src/tptserver/Makefile.in
+++ b/src/tptserver/Makefile.in
@@ -37,7 +37,7 @@ LIBS=${RXOBJS} ${UTILOBJS}\
        ${TOP_LIBDIR}/libafsauthent.a \
        ${TOP_LIBDIR}/libafsrpc.a \
        ${TOP_LIBDIR}/libcmd.a \
-       ${TOP_LIBDIR}/libopr.a \
+       $(top_builddir)/src/opr/liboafs_opr.la \
        ${TOP_LIBDIR}/libaudit.a \
        ${TOP_LIBDIR}/libafsutil.a 
 
@@ -150,7 +150,7 @@ display.o: ${PTSERVER}/display.c ${INCLS}
        ${AFS_CCRULE} ${PTSERVER}/display.c
 
 ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) map.o
-       $(AFS_LDRULE) ptserver.o ptutils.o ptprocs.o \
+       $(LT_LDRULE_static) ptserver.o ptutils.o ptprocs.o \
                ptint.ss.o ptint.xdr.o utils.o map.o \
                $(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} \
                ${XLIBS}
@@ -159,12 +159,12 @@ db_verify.o: ${PTSERVER}/db_verify.c ${INCLS}
        $(AFS_CCRULE) $(PTSERVER)/db_verify.c
 
 db_verify: db_verify.o pterror.o display.o $(LIBS)
-       $(AFS_LDRULE) db_verify.o display.o pterror.o \
+       $(LT_LDRULE_static) db_verify.o display.o pterror.o \
                $(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 ptclient: ptclient.o display.o ptuser.o pterror.o ptint.cs.o ptint.xdr.o \
        AFS_component_version_number.o $(LIBS)
-       $(AFS_LDRULE) ptclient.o display.o $(PTOBJS) \
+       $(LT_LDRULE_static) ptclient.o display.o $(PTOBJS) \
                $(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 ptclient.o: ${PTSERVER}/ptclient.c ${INCLS}
@@ -178,35 +178,35 @@ pterror.h pterror.c: ${PTSERVER}/pterror.et
        ${COMPILE_ET} -p ${srcdir}/${PTSERVER} pterror
 
 pts: pts.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) ${INCLS}
-       $(AFS_LDRULE) pts.o ${TOP_LIBDIR}/libcmd.a $(PTOBJS) \
+       $(LT_LDRULE_static) pts.o ${TOP_LIBDIR}/libcmd.a $(PTOBJS) \
                ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 pts.o: ${PTSERVER}/pts.c
        $(AFS_CCRULE) $(PTSERVER)/pts.c
 
 readgroup: readgroup.o $(PTOBJS) $(LIBS)
-       $(AFS_LDRULE) readgroup.o $(PTOBJS) \
+       $(LT_LDRULE_static) readgroup.o $(PTOBJS) \
                ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 readgroup.o: ${PTSERVER}/readgroup.c ${INCLS}
        $(AFS_CCRULE) $(PTSERVER)/readgroup.c
 
 readpwd: readpwd.o $(PTOBJS) $(LIBS)
-       $(AFS_LDRULE) readpwd.o $(PTOBJS) \
+       $(LT_LDRULE_static) readpwd.o $(PTOBJS) \
                ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 readpwd.o: ${PTSERVER}/readpwd.c ${INCLS}
        $(AFS_CCRULE) $(PTSERVER)/readpwd.c
 
 testpt: testpt.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS)
-       $(AFS_LDRULE) testpt.o -lm ${TOP_LIBDIR}/libcmd.a $(PTOBJS) \
+       $(LT_LDRULE_static) testpt.o -lm ${TOP_LIBDIR}/libcmd.a $(PTOBJS) \
                $(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 testpt.o: ${PTSERVER}/testpt.c ${INCLS}
        $(AFS_CCRULE) $(PTSERVER)/testpt.c
 
 pt_util: pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) $(LIBS)
-       $(AFS_LDRULE) pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) \
+       $(LT_LDRULE_static) pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) \
                ${TOP_LIBDIR}/libcmd.a \
                $(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
@@ -225,11 +225,13 @@ prerror.h: pterror.h
 #
 install: ptserver pts pt_util db_verify
        if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then \
-               ${INSTALL_PROGRAM} ptserver ${DESTDIR}${afssrvlibexecdir}/ptserver; \
-               ${INSTALL_PROGRAM} pts ${DESTDIR}${afssrvbindir}/pts; \
-               ${INSTALL_PROGRAM} pts ${DESTDIR}${bindir}/pts; \
-               ${INSTALL_PROGRAM} pt_util ${DESTDIR}${afssrvsbindir}/pt_util; \
-               ${INSTALL_PROGRAM} db_verify ${DESTDIR}${afssrvsbindir}/prdb_check; \
+               ${LT_INSTALL_PROGRAM} ptserver \
+                       ${DESTDIR}${afssrvlibexecdir}/ptserver; \
+               ${LT_INSTALL_PROGRAM} pts ${DESTDIR}${afssrvbindir}/pts; \
+               ${LT_INSTALL_PROGRAM} pts ${DESTDIR}${bindir}/pts; \
+               ${LT_INSTALL_PROGRAM} pt_util ${DESTDIR}${afssrvsbindir}/pt_util; \
+               ${LT_INSTALL_PROGRAM} db_verify \
+                       ${DESTDIR}${afssrvsbindir}/prdb_check; \
        fi
 
 dest: ptserver pts pt_util db_verify
@@ -245,6 +247,7 @@ dest: ptserver pts pt_util db_verify
 # Misc. targets
 #
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.a *.o ptserver ptint.cs.c ptint.ss.c ptclient ptint.xdr.c ptint.h \
        pts readgroup readpwd db_verify testpt pt_util pterror.h pterror.c \
        core AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c

diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in
index 199a9b0..4114621 100644 (file)
--- a/src/tsalvaged/Makefile.in
+++ b/src/tsalvaged/Makefile.in
@@ -54,7 +54,7 @@ LIBS=   ${TOP_LIBDIR}/libafsauthent.a \
        ${TOP_LIBDIR}/libafsrpc.a \
        ${TOP_LIBDIR}/util.a \
        ${TOP_LIBDIR}/libcmd.a \
-       ${TOP_LIBDIR}/libopr.a
+       $(top_builddir)/src/opr/liboafs_opr.la
 
 SLIBS= ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libdir.a \
@@ -63,7 +63,7 @@ SLIBS=        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/libacl.a \
        ${TOP_LIBDIR}/util.a \
-       ${TOP_LIBDIR}/libopr.a 
+       $(top_builddir)/src/opr/liboafs_opr.la
 
 all: salvageserver dafssync-debug salvsync-debug dasalvager
 
@@ -200,31 +200,31 @@ namei_ops.o: ${VOL}/namei_ops.c
        $(AFS_CCRULE) $(VOL)/namei_ops.c
 
 salvageserver: ${OBJECTS} ${LIBS}
-       $(AFS_LDRULE) ${OBJECTS} ${LIBS} \
+       $(LT_LDRULE_static) ${OBJECTS} ${LIBS} \
                $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} ${XLIBS}
 
 dasalvager: ${SOBJECTS} ${SLIBS}
-       $(AFS_LDRULE) ${SOBJECTS} ${SLIBS} \
+       $(LT_LDRULE_static) ${SOBJECTS} ${SLIBS} \
                $(LIB_roken) ${XLIBS}
 
 dafssync-debug: ${FSSDEBUG_OBJS} ${LIBS}
-       $(AFS_LDRULE) ${FSSDEBUG_OBJS} ${LIBS} \
+       $(LT_LDRULE_static) ${FSSDEBUG_OBJS} ${LIBS} \
                $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} ${XLIBS}
 
 salvsync-debug: ${SSSDEBUG_OBJS} ${LIBS}
-       $(AFS_LDRULE) ${SSSDEBUG_OBJS} ${LIBS} \
+       $(LT_LDRULE_static) ${SSSDEBUG_OBJS} ${LIBS} \
                $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} ${XLIBS}
 
 install: salvageserver dafssync-debug salvsync-debug dasalvager
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
        ${INSTALL} -d ${DESTDIR}${afssrvsbindir}
-       ${INSTALL_PROGRAM} dasalvager \
+       ${LT_INSTALL_PROGRAM} dasalvager \
                ${DESTDIR}${afssrvlibexecdir}/dasalvager
-       ${INSTALL_PROGRAM} salvageserver \
+       ${LT_INSTALL_PROGRAM} salvageserver \
                ${DESTDIR}${afssrvlibexecdir}/salvageserver
-       ${INSTALL_PROGRAM} dafssync-debug \
+       ${LT_INSTALL_PROGRAM} dafssync-debug \
                ${DESTDIR}${afssrvsbindir}/dafssync-debug
-       ${INSTALL_PROGRAM} salvsync-debug \
+       ${LT_INSTALL_PROGRAM} salvsync-debug \
                ${DESTDIR}${afssrvsbindir}/salvsync-debug
 
 dest: salvageserver dafssync-debug salvsync-debug dasalvager
@@ -239,6 +239,7 @@ dest: salvageserver dafssync-debug salvsync-debug dasalvager
                ${DEST}/root.server/usr/afs/bin/salvsync-debug
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o salvageserver core AFS_component_version_number.c dafssync-debug salvsync-debug dasalvager
 
 include ../config/Makefile.version

diff --git a/src/tubik/Makefile.in b/src/tubik/Makefile.in
index 8a2e639..3f48564 100644 (file)
--- a/src/tubik/Makefile.in
+++ b/src/tubik/Makefile.in
@@ -33,7 +33,7 @@ UTILOBJS=uuid.o serverLog.o fileutil.o dirpath.o \
 LIBS=${RXOBJS} ${UTILOBJS} ${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a \
      ${TOP_LIBDIR}/libafscom_err.a ${TOP_LIBDIR}/libcmd.a \
      ${TOP_LIBDIR}/libsys.a \
-     $(TOP_LIBDIR)/libopr.a \
+     $(top_builddir)/src/opr/liboafs_opr.la \
      ${XLIBS} ${MT_LIBS}
 
 all: depinstall ${TOP_LIBDIR}/libubik_pthread.a udebug utst_server utst_client
@@ -92,15 +92,15 @@ pthread_threadname.o: ${UTIL}/pthread_threadname.c
 #
 
 utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik_pthread.a ${RXOBJS} ${UTILOBJS}
-       $(AFS_LDRULE) utst_server.o utst_int.ss.o utst_int.xdr.o \
+       $(LT_LDRULE_static) utst_server.o utst_int.ss.o utst_int.xdr.o \
                libubik_pthread.a $(LIBS) $(LIB_hcrypto) $(LIB_roken)
 
 utst_client: utst_client.o utst_int.cs.o utst_int.xdr.o libubik_pthread.a ${RXOBJS} ${UTILOBJS}
-       $(AFS_LDRULE) utst_client.o utst_int.cs.o utst_int.xdr.o \
+       $(LT_LDRULE_static) utst_client.o utst_int.cs.o utst_int.xdr.o \
                libubik_pthread.a $(LIBS) $(LIB_hcrypto) $(LIB_roken)
 
 udebug: udebug.o libubik_pthread.a ${RXOBJS} ${UTILOBJS}
-       $(AFS_LDRULE) udebug.o libubik_pthread.a \
+       $(LT_LDRULE_static) udebug.o libubik_pthread.a \
                $(LIBS) $(LIB_hcrypto) $(LIB_roken)
 
 ubik_int.cs.c: ${UBIK}/ubik_int.xg
@@ -212,8 +212,8 @@ install: libubik_pthread.a ubik.h ubik_int.h udebug
        ${INSTALL} -d ${DESTDIR}${afssrvbindir}
        ${INSTALL_DATA} libubik_pthread.a ${DESTDIR}${libdir}/libubik_pthread.a
        if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then                 \
-           ${INSTALL_PROGRAM} udebug ${DESTDIR}${bindir}/udebug;          \
-           ${INSTALL_PROGRAM} udebug ${DESTDIR}${afssrvbindir}/udebug;    \
+           $(LT_INSTALL_PROGRAM) udebug ${DESTDIR}${bindir}/udebug;          \
+           $(LT_INSTALL_PROGRAM) udebug ${DESTDIR}${afssrvbindir}/udebug;    \
            ${INSTALL_DATA} ubik.h ${DESTDIR}${includedir}/ubik.h;         \
            ${INSTALL_DATA} ubik_int.h ${DESTDIR}${includedir}/ubik_int.h; \
        fi
@@ -233,6 +233,7 @@ dest: libubik_pthread.a ubik.h ubik_int.h udebug
 # Misc. targets
 #
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o utst_server utst_client udebug *.a *.cs.c *.ss.c *.xdr.c
        $(RM) -f utst_int.h ubik_int.h uerrors.c ubik.h core AFS_component_version_number.c Kubik_int.h
 

diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in
index 7a1fa5e..d762e7f 100644 (file)
--- a/src/tvlserver/Makefile.in
+++ b/src/tvlserver/Makefile.in
@@ -37,7 +37,7 @@ LIBS= ${TOP_LIBDIR}/libubik_pthread.a \
        ${TOP_LIBDIR}/libafsrpc.a \
        ${TOP_LIBDIR}/libaudit.a \
        ${TOP_LIBDIR}/libafsutil.a \
-       ${TOP_LIBDIR}/libopr.a
+       $(top_builddir)/src/opr/liboafs_opr.la
 
 OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o ${RXOBJS} ${UTILOBJS} 
 
@@ -96,28 +96,28 @@ pthread_threadname.o: ${UTIL}/pthread_threadname.c
 
 
 vldb_check: vldb_check.o ${LIBS} AFS_component_version_number.o
-       $(AFS_LDRULE) vldb_check.o AFS_component_version_number.o \
+       $(LT_LDRULE_static) vldb_check.o AFS_component_version_number.o \
                ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} 
 
 vldb_check.o: ${VLSERVER}/vldb_check.c 
        $(AFS_CCRULE) $(VLSERVER)/vldb_check.c
 
 cnvldb: cnvldb.o ${LIBS} 
-       $(AFS_LDRULE) cnvldb.o \
+       $(LT_LDRULE_static) cnvldb.o \
                ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 cnvldb.o: ${VLSERVER}/cnvldb.c
        $(AFS_CCRULE) $(VLSERVER)/cnvldb.c
 
 sascnvldb: sascnvldb.o ${LIBS} 
-       $(AFS_LDRULE) sascnvldb.o \
+       $(LT_LDRULE_static) sascnvldb.o \
                ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 sascnvldb.o: ${VLSERVER}/sascnvldb.c
        $(AFS_CCRULE) $(VLSERVER)/sascnvldb.c
 
 vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS)
-       $(AFS_LDRULE) vlserver.o vlutils.o vlprocs.o vldbint.ss.o \
+       $(LT_LDRULE_static) vlserver.o vlutils.o vlprocs.o vldbint.ss.o \
                vldbint.xdr.o \
                $(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
@@ -157,7 +157,7 @@ Kvldbint.xdr.c: ${VLSERVER}/vldbint.xg
        ${RXGEN} -A -x -k -c -o $@ ${srcdir}/${VLSERVER}/vldbint.xg
 
 vlclient: vlclient.o $(OBJS) $(LIBS) ${INCLS}
-       $(AFS_LDRULE) vlclient.o $(OBJS) ${TOP_LIBDIR}/libcmd.a \
+       $(LT_LDRULE_static) vlclient.o $(OBJS) ${TOP_LIBDIR}/libcmd.a \
                $(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
                
 vlclient.o: ${VLSERVER}/vlclient.c
@@ -172,16 +172,22 @@ system: install
 
 install: vlserver cnvldb vldb_check
        if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then \
-               ${INSTALL_PROGRAM} vlserver ${DESTDIR}${afssrvlibexecdir}/vlserver; \
-               ${INSTALL_PROGRAM} cnvldb ${DESTDIR}${afssrvsbindir}/vldb_convert; \
-               ${INSTALL_PROGRAM} vldb_check ${DESTDIR}${afssrvsbindir}/vldb_check; \
+               $(LT_INSTALL_PROGRAM) vlserver \
+                       ${DESTDIR}${afssrvlibexecdir}/vlserver; \
+               $(LT_INSTALL_PROGRAM) cnvldb \
+                       ${DESTDIR}${afssrvsbindir}/vldb_convert; \
+               $(LT_INSTALL_PROGRAM) vldb_check \
+                       ${DESTDIR}${afssrvsbindir}/vldb_check; \
        fi
 
 dest: vlserver cnvldb vldb_check
        if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then \
-               ${INSTALL_PROGRAM} vlserver ${DEST}/root.server/usr/afs/bin/vlserver; \
-               ${INSTALL_PROGRAM} cnvldb ${DEST}/etc/vldb_convert; \
-               ${INSTALL_PROGRAM} vldb_check ${DEST}/etc/vldb_check; \
+               $(LT_INSTALL_PROGRAM) vlserver \
+                       ${DEST}/root.server/usr/afs/bin/vlserver; \
+               $(LT_INSTALL_PROGRAM) cnvldb \
+                       ${DEST}/etc/vldb_convert; \
+               $(LT_INSTALL_PROGRAM) vldb_check \
+                       ${DEST}/etc/vldb_check; \
        fi
 
 #
@@ -190,6 +196,7 @@ dest: vlserver cnvldb vldb_check
 include ../config/Makefile.version
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o *.a *.otl *.xdr.c *.cs.c *.ss.c core \
                vlserver vlclient cnvldb vldbint.h vlserver.h vldb_check \
                vl_errors.c AFS_component_version_number.c

diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index 3f3e27a..cd0d0be 100644 (file)
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -54,7 +54,7 @@ LIBS= ${TOP_LIBDIR}/libcmd.a          \
        ${TOP_LIBDIR}/libafsutil.a      \
        ${TOP_LIBDIR}/libusd.a          \
        ${TOP_LIBDIR}/libafsrpc.a       \
-       $(TOP_LIBDIR)/libopr.a
+       $(top_builddir)/src/opr/liboafs_opr.la
 
 all: volserver vos
 
@@ -208,20 +208,20 @@ vos.o: ${VOLSER}/vos.c
        $(AFS_CCRULE) -I../volser $(VOLSER)/vos.c
 
 vos: vos.o  ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${TOP_LIBDIR}/libubik_pthread.a
-       $(AFS_LDRULE) vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} \
+       $(LT_LDRULE_static) vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} \
                ${TOP_LIBDIR}/libubik_pthread.a \
                $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 volserver: ${objects} ${LIBS}
-       $(AFS_LDRULE) ${objects} \
+       $(LT_LDRULE_static) ${objects} \
                ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 install: volserver
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
-       ${INSTALL} volserver ${DESTDIR}${afssrvlibexecdir}/volserver
+       ${LT_INSTALL_PROGRAM} volserver ${DESTDIR}${afssrvlibexecdir}/volserver
        if [ "x$(ENABLE_PTHREADED_UBIK)" = "xyes" ] ; then     \
-           ${INSTALL} vos ${DESTDIR}${afssrvsbindir}/vos;     \
-           ${INSTALL} vos ${DESTDIR}${sbindir}/vos;           \
+           $(LT_INSTALL_PROGRAM) vos ${DESTDIR}${afssrvsbindir}/vos;     \
+           $(LT_INSTALL_PROGRAM) vos ${DESTDIR}${sbindir}/vos;           \
        fi
 
 dest: volserver
@@ -233,6 +233,7 @@ dest: volserver
        fi
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o volserver core AFS_component_version_number.c
 
 include ../config/Makefile.version

diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index 5166b53..1619947 100644 (file)
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -29,7 +29,7 @@ AFSIO_LIBS=${TOP_LIBDIR}/libafscp.a \
        ${TOP_LIBDIR}/libafsrpc.a \
        ${TOP_LIBDIR}/libcmd.a \
        $(TOP_LIBDIR)/libafsutil.a \
-       $(TOP_LIBDIR)/libopr.a
+       $(top_builddir)/src/opr/liboafs_opr.la
 
 FSLIBS=${TOP_LIBDIR}/libsys.a \
         ${TOP_LIBDIR}/libvldb.a \
@@ -94,7 +94,8 @@ afscbint.ss.o: ../fsint/afscbint.ss.c
        ${PTH_CCRULE} ../fsint/afscbint.ss.c
 
 afsio: afsio.o vldbint.cs.o afscbint.ss.o vldbint.xdr.o ${AFSIO_LIBS}
-       $(MT_CC) $(PTH_LDFLAGS) $(AFS_CFLAGS) -o afsio afsio.o vldbint.cs.o afscbint.ss.o vldbint.xdr.o ${AFSIO_LIBS} \
+       $(LT_LDRULE_static) afsio.o vldbint.cs.o afscbint.ss.o vldbint.xdr.o \
+               ${AFSIO_LIBS} \
                $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} \
                $(LDFLAGS_krb5) $(LIB_krb5)
 

diff --git a/src/viced/Makefile.in b/src/viced/Makefile.in
index 43f70e4..6388324 100644 (file)
--- a/src/viced/Makefile.in
+++ b/src/viced/Makefile.in
@@ -50,7 +50,7 @@ objects= ${VICEDOBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
 LIBS=${TOP_LIBDIR}/libafsauthent.a \
      ${TOP_LIBDIR}/libafsrpc.a \
      $(TOP_LIBDIR)/libcmd.a \
-     $(TOP_LIBDIR)/libopr.a \
+     $(top_builddir)/src/opr/liboafs_opr.la \
      ${TOP_LIBDIR}/util.a
 
 all: cbd fsprobe check_sysid fileserver ${TOP_INCDIR}/afs/fs_stats.h
@@ -65,15 +65,15 @@ check_sysid: check_sysid.c
 fsprobe.o: fsprobe.c AFS_component_version_number.c
 
 fsprobe: fsprobe.o
-       $(AFS_LDRULE) fsprobe.o \
-               ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
+       $(LT_LDRULE_static) fsprobe.o \
+               ${LIBS} $(LIB_hcrypto) $(LIB_roken) $(MT_LIBS) ${XLIBS}
 
 CFLAGS_cbd.o = -DINTERPRET_DUMP
 cbd.o: callback.c AFS_component_version_number.c
        $(AFS_CCRULE) $(srcdir)/callback.c
 
 cbd: cbd.o
-       $(AFS_LDRULE) cbd.o ${LIBS} $(LIB_roken) ${XLIBS}
+       $(LT_LDRULE_static) cbd.o ${LIBS} $(LIB_roken) ${XLIBS}
 
 CFLAGS_rx_pthread.o = -DDPF_FSLOG
 rx_pthread.o: ${RX}/rx_pthread.c
@@ -206,13 +206,13 @@ afsint.xdr.o: ../fsint/afsint.xdr.c
        $(AFS_CCRULE) ../fsint/afsint.xdr.c
 
 fileserver: ${objects} ${LIBS}
-       $(AFS_LDRULE) ${objects} \
+       $(LT_LDRULE_static) ${objects} \
                ${LIBS} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 install: fileserver
        ${INSTALL} -d ${DESTDIR}${afssrvlibexecdir}
        ${INSTALL} -d ${DESTDIR}${afssrvsbindir}
-       ${INSTALL} fileserver \
+       ${LT_INSTALL_PROGRAM} fileserver \
                ${DESTDIR}${afssrvlibexecdir}/fileserver
 
 dest: fileserver
@@ -221,6 +221,7 @@ dest: fileserver
                ${DEST}/root.server/usr/afs/bin/fileserver
 
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o fileserver core AFS_component_version_number.c \
               cbd check_sysid fsprobe
 

diff --git a/tests/auth/Makefile.in b/tests/auth/Makefile.in
index bb00344..fe669c2 100644 (file)
--- a/tests/auth/Makefile.in
+++ b/tests/auth/Makefile.in
@@ -14,29 +14,29 @@ MODULE_LIBS =       ../tap/libtap.a \
                $(abs_top_builddir)/lib/libafsauthent.a \
                $(abs_top_builddir)/lib/libafsrpc.a \
                $(abs_top_builddir)/lib/libafshcrypto.a \
-               $(abs_top_builddir)/lib/libopr.a \
+               $(abs_top_builddir)/lib/liboafs_opr.la \
                $(LIB_rfc3961) $(LIB_roken) -lafsutil\
                $(XLIBS)
 
 authcon-t: authcon-t.o ../common/config.o
-       $(AFS_LDRULE) authcon-t.o ../common/config.o \
+       $(LT_LDRULE_static) authcon-t.o ../common/config.o \
                $(MODULE_LIBS)
 
 superuser-t: superuser-t.o ../common/config.o ../common/rxkad.o \
             test.cs.o test.ss.o test.xdr.o
-       $(AFS_LDRULE) superuser-t.o ../common/config.o ../common/rxkad.o \
-               ../common/servers.o \
+       $(LT_LDRULE_static) superuser-t.o ../common/config.o
+               ../common/rxkad.o ../common/servers.o \
                test.cs.o test.ss.o test.xdr.o \
                $(MODULE_LIBS)
 
 keys-t: keys-t.o ../common/config.o
-       $(AFS_LDRULE) keys-t.o ../common/config.o $(MODULE_LIBS)
+       $(LT_LDRULE_static) keys-t.o ../common/config.o $(MODULE_LIBS)
 
 realms-t: realms-t.o ../common/config.o
-       $(AFS_LDRULE) realms-t.o ../common/config.o $(MODULE_LIBS)
+       $(LT_LDRULE_static) realms-t.o ../common/config.o $(MODULE_LIBS)
 
 writekeyfile: writekeyfile.o
-       $(AFS_LDRULE) writekeyfile.o $(MODULE_LIBS)
+       $(LT_LDRULE_static) writekeyfile.o $(MODULE_LIBS)
 
 test.cs.c: test.xg
        $(RXGEN) -A -x -C -o $@ $(srcdir)/test.xg
@@ -53,5 +53,6 @@ test.h: test.xg
 superuser-t.o: test.h
 
 clean:
+       $(LT_CLEAN)
        rm -f *.o *.cs.c *.ss.c *.xdr.c test.h \
                writekeyfile $(TESTS)

diff --git a/tests/cmd/Makefile.in b/tests/cmd/Makefile.in
index 41b550f..43aceb0 100644 (file)
--- a/tests/cmd/Makefile.in
+++ b/tests/cmd/Makefile.in
@@ -10,7 +10,7 @@ MODULE_CFLAGS = -I$(srcdir)/../..
 LIBS = ../tap/libtap.a \
        $(abs_top_builddir)/lib/libcmd.a \
        $(abs_top_builddir)/lib/libafscom_err.a \
-       $(abs_top_builddir)/lib/libopr.a \
+       $(abs_top_builddir)/src/opr/liboafs_opr.la \
        $(abs_top_builddir)/lib/util.a
 
 tests = command-t
@@ -18,9 +18,10 @@ tests = command-t
 all check test tests: $(tests)
 
 command-t: command-t.o $(LIBS)
-       $(AFS_LDRULE) command-t.o $(LIBS) $(LIB_roken) $(XLIBS)
+       $(LT_LDRULE_static) command-t.o $(LIBS) $(LIB_roken) $(XLIBS)
 
 install:
 
 clean distclean:
+       $(LT_CLEAN)
        $(RM) -f $(tests) *.o core

diff --git a/tests/rx/Makefile.in b/tests/rx/Makefile.in
index 17b510a..f352bcd 100644 (file)
--- a/tests/rx/Makefile.in
+++ b/tests/rx/Makefile.in
@@ -9,15 +9,16 @@ MODULE_CFLAGS = -I$(srcdir)/../..
 
 LIBS = ../tap/libtap.a \
        $(abs_top_builddir)/lib/libafsrpc.a \
-       $(abs_top_builddir)/lib/libopr.a
+       $(abs_top_builddir)/src/opr/liboafs_opr.la
 
 tests = event-t
 
 all check test tests: $(tests)
 
 event-t: event-t.o $(LIBS)
-       $(AFS_LDRULE) event-t.o $(LIBS) $(LIB_roken) $(XLIBS)
+       $(LT_LDRULE_static) event-t.o $(LIBS) $(LIB_roken) $(XLIBS)
 install:
 
 clean distclean:
+       $(LT_clean)
        $(RM) -f $(tests) *.o core

diff --git a/tests/volser/Makefile.in b/tests/volser/Makefile.in
index ad11dda..3bcd7bb 100644 (file)
--- a/tests/volser/Makefile.in
+++ b/tests/volser/Makefile.in
@@ -20,13 +20,14 @@ MODULE_LIBS =       ../tap/libtap.a \
                $(abs_top_builddir)/lib/libafsauthent.a \
                $(abs_top_builddir)/lib/libafsrpc.a \
                $(abs_top_builddir)/lib/libafshcrypto.a \
-               $(abs_top_builddir)/lib/libopr.a \
+               $(abs_top_builddir)/src/opr/liboafs_opr.la \
                $(LIB_rfc3961) $(LIB_roken) -lafsutil\
                $(XLIBS)
 
 vos-t: vos-t.o ../common/config.o ../common/servers.o ../common/ubik.o
-       $(AFS_LDRULE) vos-t.o ../common/config.o ../common/servers.o \
+       $(LT_LDRULE_static) vos-t.o ../common/config.o ../common/servers.o \
                ../common/ubik.o $(MODULE_LIBS)
 
 clean:
+       $(LT_CLEAN)
        rm -f *.o $(TESTS)