ptserver: Use libtool to build a pthreaded libprot

Use libtool to build a pthreaded version of libprot in src/ptserver.
Make the tptserver directory just build pthreaded versions of the
client and server, and link these against libprot

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

diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in
index 82e5f12..4911afc 100644 (file)
--- a/src/ptserver/Makefile.in
+++ b/src/ptserver/Makefile.in
@@ -6,6 +6,7 @@
 # directory or online at http://www.openafs.org/dl/license10.html
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.libtool
 include @TOP_OBJDIR@/src/config/Makefile.lwp
 
 ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
@@ -42,8 +43,15 @@ LIBS=   ${TOP_LIBDIR}/libubik.a \
        ${TOP_LIBDIR}/libopr.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
+LT_objs = ptuser.lo pterror.lo ptint.cs.lo ptint.xdr.lo display.lo
 
-all: ptserver pts pt_util db_verify ${TOP_LIBDIR}/libprot.a \
+LT_deps = $(top_builddir)/src/opr/liboafs_opr.la \
+         $(top_builddir)/src/rx/liboafs_rx.la \
+         $(top_builddir)/src/ubik/liboafs_ubik.la \
+         $(top_builddir)/src/auth/liboafs_auth.la
+LT_libs =
+
+all: ptserver pts pt_util db_verify liboafs_prot.la ${TOP_LIBDIR}/libprot.a \
        depinstall readgroup readpwd testpt ptclient
 
 generated: \
@@ -139,30 +147,30 @@ Kptint.xdr.c: ptint.xg
 Kptint.h: ptint.xg
        ${RXGEN} -A -x -k -h -o Kptint.h ${srcdir}/ptint.xg
 
-display.o: display.c ${INCLS}
-
 db_verify.o: db_verify.c ${INCLS} AFS_component_version_number.c
 
-db_verify: db_verify.o pterror.o display.o $(LIBS)
-       $(AFS_LDRULE) db_verify.o display.o pterror.o \
+db_verify: db_verify.o libprot.a $(LIBS)
+       $(AFS_LDRULE) db_verify.o libprot.a \
                $(LIBS) $(LIB_roken) ${XLIBS}
 
-ptclient: ptclient.o display.o libprot.a $(LIBS)
-       $(AFS_LDRULE) ptclient.o display.o libprot.a \
+ptclient: ptclient.o libprot.a $(LIBS)
+       $(AFS_LDRULE) ptclient.o libprot.a \
                $(LIBS) $(LIB_roken) ${XLIBS}
 
 ptclient.o: ptclient.c ${INCLS} AFS_component_version_number.c
 
-ptuser.o: ptuser.c ${LINCLS}
-
 pterror.h pterror.c: pterror.et
        $(RM) -f pterror.h pterror.c
        ${COMPILE_ET} -p ${srcdir} pterror
 
-libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o
-       $(RM) -f $@
-       $(AR) crv $@ ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o
-       $(RANLIB) $@
+display.lo: $(INCLS)
+ptuser.lo: $(LINCLS)
+
+liboafs_prot.la: liboafs_prot.la.sym $(LT_objs) $(LT_deps)
+       $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs)
+
+libprot.a: $(LT_objs)
+       $(LT_LDLIB_lwp) $(LT_objs)
 
 pts: pts.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS)
        $(AFS_LDRULE) pts.o ${TOP_LIBDIR}/libcmd.a libprot.a \
@@ -262,6 +270,7 @@ dest: ptserver pts pt_util db_verify libprot.a ptclient.h pterror.h \
 # Misc. targets
 #
 clean:
+       $(LT_CLEAN)
        $(RM) -f *.a *.o ptserver ptint.cs.c ptint.ss.c ptclient ptint.xdr.c ptint.h \
        libprot.a 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/ptserver/liboafs_prot.la.sym b/src/ptserver/liboafs_prot.la.sym
new file mode 100644 (file)
index 0000000..af1109a
--- /dev/null
+++ b/src/ptserver/liboafs_prot.la.sym
@@ -0,0 +1,40 @@
+initialize_PT_error_table
+pr_AddToGroup
+pr_ChangeEntry
+pr_CreateGroup
+pr_CreateUser
+pr_Delete
+pr_DeleteByID
+pr_End
+pr_GetCPS
+pr_IDListExpandedMembers
+pr_IDListMembers
+pr_IdToName
+pr_Initialize
+pr_IsAMemberOf
+pr_ListEntries
+pr_ListEntry
+pr_ListMaxGroupId
+pr_ListMaxUserId
+pr_ListMembers
+pr_ListOwned
+pr_ListSuperGroups
+pr_NameToId
+pr_PrintEntry
+pr_RemoveUserFromGroup
+pr_SIdToName
+pr_SNameToId
+pr_SetFieldsEntry
+pr_SetMaxGroupId
+pr_SetMaxUserId
+pruclient
+ubik_PR_AddToGroup
+ubik_PR_Delete
+ubik_PR_GetCPS
+ubik_PR_GetHostCPS
+ubik_PR_IDToName
+ubik_PR_ListElements
+ubik_PR_ListOwned
+ubik_PR_NameToID
+ubik_PR_NewEntry
+ubik_PR_RemoveFromGroup

diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in
index 450a93e..4ed8ba8 100644 (file)
--- a/src/tptserver/Makefile.in
+++ b/src/tptserver/Makefile.in
@@ -12,11 +12,8 @@ include @TOP_OBJDIR@/src/config/Makefile.pthread
 HELPER_SPLINT=@HELPER_SPLINT@
 ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
 
-RX=$(srcdir)/../rx
 PTSERVER=$(srcdir)/../ptserver
 
-PTOBJS=ptuser.o pterror.o ptint.cs.o ptint.xdr.o
-
 INCLS=${TOP_INCDIR}/ubik.h \
        ${TOP_INCDIR}/lock.h  \
        ${TOP_INCDIR}/lwp.h \
@@ -24,8 +21,7 @@ INCLS=${TOP_INCDIR}/ubik.h \
        ${TOP_INCDIR}/rx/xdr.h \
        ${TOP_INCDIR}/afs/keys.h \
        ${TOP_INCDIR}/afs/cellconfig.h \
-       ptint.h \
-       pterror.h
+       ptint.h
 
 LIBS_common= \
        $(top_builddir)/src/ubik/liboafs_ubik.la \
@@ -43,7 +39,8 @@ LIBS_server= \
        $(top_builddir)/src/audit/liboafs_audit.la \
        $(LIBS_common)
 
-LIBS_client=$(PTOBJS) \
+LIBS_client= \
+       $(top_builddir)/src/ptserver/liboafs_prot.la \
        $(LIBS_common)
 
 all: ptserver pts pt_util db_verify \
@@ -75,13 +72,6 @@ utils.o: ${PTSERVER}/utils.c ${INCLS}
 map.o: ${PTSERVER}/map.c ${INCLS}
        $(AFS_CCRULE) $(PTSERVER)/map.c
 
-ptint.ss.o: ptint.ss.c
-ptint.cs.o: ptint.cs.c
-ptint.xdr.o: ptint.xdr.c
-
-ptint.cs.c: ${PTSERVER}/ptint.xg
-       ${RXGEN} -A -x -C -u -o $@ ${srcdir}/${PTSERVER}/ptint.xg
-
 ptint.ss.c: ${PTSERVER}/ptint.xg
        ${RXGEN} -A -x -S -o $@ ${srcdir}/${PTSERVER}/ptint.xg
 
@@ -91,22 +81,9 @@ ptint.xdr.c: ${PTSERVER}/ptint.xg
 ptint.h: ${PTSERVER}/ptint.xg
        ${RXGEN} -A -x -h -u -o $@ ${srcdir}/${PTSERVER}/ptint.xg
 
-ptint.cs.c: ptint.h
 ptint.ss.c: ptint.h
 ptint.xdr.c: ptint.h
 
-Kptint.cs.c: ${PTSERVER}/ptint.xg Kptint.h
-       ${RXGEN} -A -x -k -C -o Kptint.cs.c ${srcdir}/${PTSERVER}/ptint.xg
- 
-Kptint.xdr.c: ${PTSERVER}/ptint.xg
-       ${RXGEN} -A -x -k -c -o Kptint.xdr.c ${srcdir}/${PTSERVER}/ptint.xg
- 
-Kptint.h: ${PTSERVER}/ptint.xg
-       ${RXGEN} -A -x -k -h -o Kptint.h ${srcdir}/${PTSERVER}/ptint.xg
-
-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 map.o \
          $(LIBS_server)
        $(LT_LDRULE_static) ptserver.o ptutils.o ptprocs.o \
@@ -118,25 +95,17 @@ ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o map.o \
 db_verify.o: ${PTSERVER}/db_verify.c ${INCLS}
        $(AFS_CCRULE) $(PTSERVER)/db_verify.c
 
-db_verify: db_verify.o display.o $(LIBS_client)
-       $(LT_LDRULE_static) db_verify.o display.o \
+db_verify: db_verify.o $(LIBS_client)
+       $(LT_LDRULE_static) db_verify.o \
                $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
-ptclient: ptclient.o display.o ptuser.o ptint.cs.o ptint.xdr.o \
-       AFS_component_version_number.o $(LIBS_client)
-       $(LT_LDRULE_static) ptclient.o display.o $(PTOBJS) \
+ptclient: ptclient.o AFS_component_version_number.o $(LIBS_client)
+       $(LT_LDRULE_static) ptclient.o \
                $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 ptclient.o: ${PTSERVER}/ptclient.c ${INCLS}
        $(AFS_CCRULE) $(PTSERVER)/ptclient.c
 
-ptuser.o: ${PTSERVER}/ptuser.c ${INCLS}
-       $(AFS_CCRULE) $(PTSERVER)/ptuser.c
-
-pterror.h pterror.c: ${PTSERVER}/pterror.et
-       $(RM) -f pterror.h pterror.c
-       ${COMPILE_ET} -p ${srcdir}/${PTSERVER} pterror
-
 pts: pts.o $(LIBS_client) ${INCLS}
        $(LT_LDRULE_static) pts.o \
                ${LIBS_client} $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}