usd: Convert to using libtool

Turn the libusd library into a libtool object (it has no pthread/LWP
differences, and so can just become a pthreaded library), and include
it as such in butc and the volser. liboafs_usd.la is the libtool
object, libusd.a is preserved as a static object for backwards
compatibility.

Change-Id: I25c3d0f429415527fe529c3d3e5afbad9490ea45
Reviewed-on: http://gerrit.openafs.org/8057
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>

diff --git a/src/dvolser/Makefile.in b/src/dvolser/Makefile.in
index 8d4664e..19b5253 100644 (file)
--- a/src/dvolser/Makefile.in
+++ b/src/dvolser/Makefile.in
@@ -45,7 +45,7 @@ LIBS= $(top_builddir)/src/cmd/liboafs_cmd.la          \
        ${TOP_LIBDIR}/libafsrpc.a       \
        $(top_builddir)/src/util/liboafs_util.la        \
        $(top_builddir)/src/opr/liboafs_opr.la          \
-       ${TOP_LIBDIR}/libusd.a
+       $(top_builddir)/src/usd/liboafs_usd.la
 
 all: davolserver 
 

diff --git a/src/tbutc/Makefile.in b/src/tbutc/Makefile.in
index 0b81558..6f5d90a 100644 (file)
--- a/src/tbutc/Makefile.in
+++ b/src/tbutc/Makefile.in
@@ -58,7 +58,7 @@ BUTCLIBS=${TOP_LIBDIR}/libbudb.a \
             $(top_builddir)/src/cmd/liboafs_cmd.la \
            $(top_builddir)/src/util/liboafs_util.la \
            $(top_builddir)/src/opr/liboafs_opr.la \
-           ${TOP_LIBDIR}/libusd.a \
+           $(top_builddir)/src/usd/liboafs_usd.la \
            ${TOP_LIBDIR}/libprocmgmt.a
 
 #

diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index 713fccf..e022ef9 100644 (file)
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -50,7 +50,7 @@ LIBS_common = \
        $(top_builddir)/src/cmd/liboafs_cmd.la \
        ${TOP_LIBDIR}/libafsauthent.a   \
        $(top_builddir)/src/util/liboafs_util.la      \
-       ${TOP_LIBDIR}/libusd.a          \
+       $(top_builddir)/src/usd/liboafs_usd.la          \
        ${TOP_LIBDIR}/libafsrpc.a       \
        $(top_builddir)/src/opr/liboafs_opr.la
 

diff --git a/src/usd/Makefile.in b/src/usd/Makefile.in
index e02bc8f..c4249bb 100644 (file)
--- a/src/usd/Makefile.in
+++ b/src/usd/Makefile.in
@@ -7,10 +7,13 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
-include @TOP_OBJDIR@/src/config/Makefile.lwp
+include @TOP_OBJDIR@/src/config/Makefile.libtool
+include @TOP_OBJDIR@/src/config/Makefile.pthread
 
+LT_objs = usd_file.lo AFS_component_version_number.lo
+LT_deps = $(top_builddir)/src/opr/liboafs_opr.la
 
-all: ${TOP_LIBDIR}/libusd.a ${TOP_INCDIR}/afs/usd.h
+all: liboafs_usd.la ${TOP_LIBDIR}/libusd.a ${TOP_INCDIR}/afs/usd.h
 
 ${TOP_LIBDIR}/libusd.a: libusd.a
        ${INSTALL_DATA} $? $@
@@ -21,12 +24,13 @@ ${TOP_INCDIR}/afs/usd.h: usd.h
 #
 # Build targets
 #
-libusd.a: usd_file.o AFS_component_version_number.o
-       $(RM) -f $@
-       $(AR) crv $@ usd_file.o AFS_component_version_number.o
-       $(RANLIB) $@
+liboafs_usd.la: liboafs_usd.la.sym $(LT_objs) $(LT_deps)
+       $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
 
-usd_file.o: usd_file.c usd.h
+libusd.a: $(LT_objs)
+       $(LT_LDLIB_static) $(LT_objs)
+
+usd_file.lo: usd.h
 
 #
 # Installation targets
@@ -47,6 +51,7 @@ dest: libusd.a usd.h
 # Misc. targets
 #
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.o libusd.a core AFS_component_version_number.c
 
 include ../config/Makefile.version

diff --git a/src/usd/liboafs_usd.la.sym b/src/usd/liboafs_usd.la.sym
new file mode 100644 (file)
index 0000000..e284928
--- /dev/null
+++ b/src/usd/liboafs_usd.la.sym
@@ -0,0 +1,3 @@
+usd_StandardInput
+usd_StandardOutput
+usd_Open