ptserver: Rename ubik.c as ptubik.c

[openafs.git] / src / tptserver / Makefile.in

diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in
index 639817e..5a217c6 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,27 +21,33 @@ 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_LIBDIR}/libubik_pthread.a \
-       ${TOP_LIBDIR}/libafsauthent.a \
-       ${TOP_LIBDIR}/libafsrpc.a \
+       $(top_builddir)/src/ubik/liboafs_ubik.la \
+       $(top_builddir)/src/sys/liboafs_sys.la \
+       $(top_builddir)/src/rx/liboafs_rx.la \
+       $(top_builddir)/src/rxstat/liboafs_rxstat.la \
+       $(top_builddir)/src/lwp/liboafs_lwpcompat.la \
+       $(top_builddir)/src/rxkad/liboafs_rxkad.la \
        $(top_builddir)/src/cmd/liboafs_cmd.la \
        $(top_builddir)/src/util/liboafs_util.la \
        $(top_builddir)/src/opr/liboafs_opr.la
 
 LIBS_server= \
-       ${TOP_LIBDIR}/libaudit.a \
+       $(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 \
        depinstall readgroup readpwd testpt
 
+generated: \
+       pterror.h pterror.c
+
 depinstall: 
 
 # When supergroups is enabled, some parts of ptserver cast between
@@ -59,7 +62,7 @@ CFLAGS_ptprocs.o = @CFLAGS_NOSTRICT@
 ptserver.o: ${PTSERVER}/ptserver.c ${INCLS}
        $(AFS_CCRULE) $(PTSERVER)/ptserver.c
 
-ptutils.o: ${PTSERVER}/ptutils.c ${INCLS}
+ptutils.o: ${PTSERVER}/ptutils.c ${INCLS} pterror.h
        $(AFS_CCRULE) $(PTSERVER)/ptutils.c
 
 ptprocs.o: ${PTSERVER}/ptprocs.c ${INCLS}
@@ -71,38 +74,18 @@ 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
+       ${RXGEN} -A -x -S -o $@ ${PTSERVER}/ptint.xg
 
 ptint.xdr.c: ${PTSERVER}/ptint.xg
-       ${RXGEN} -A -x -c -o $@ ${srcdir}/${PTSERVER}/ptint.xg
+       ${RXGEN} -A -x -c -o $@ ${PTSERVER}/ptint.xg
 
 ptint.h: ${PTSERVER}/ptint.xg
-       ${RXGEN} -A -x -h -u -o $@ ${srcdir}/${PTSERVER}/ptint.xg
+       ${RXGEN} -A -x -h -u -o $@ ${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 \
@@ -114,25 +97,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}
@@ -161,15 +136,20 @@ testpt: testpt.o $(LIBS_client)
 testpt.o: ${PTSERVER}/testpt.c ${INCLS}
        $(AFS_CCRULE) $(PTSERVER)/testpt.c
 
-pt_util: pt_util.o ptutils.o ubik.o utils.o map.o $(LIBS_client)
-       $(LT_LDRULE_static) pt_util.o ptutils.o ubik.o utils.o map.o \
+pt_util: pt_util.o ptutils.o ptubik.o utils.o map.o $(LIBS_client)
+       $(LT_LDRULE_static) pt_util.o ptutils.o ptubik.o utils.o map.o \
                $(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 pt_util.o: ${PTSERVER}/pt_util.c
        $(AFS_CCRULE) $(PTSERVER)/pt_util.c
 
-ubik.o: ${PTSERVER}/ubik.c ${INCLS}
-       $(AFS_CCRULE) $(PTSERVER)/ubik.c
+ptubik.o: ${PTSERVER}/ptubik.c ${INCLS}
+       $(AFS_CCRULE) $(PTSERVER)/ptubik.c
+
+pterror.h: pterror.c
+pterror.c: ${PTSERVER}/pterror.et
+       $(RM) -f pterror.h pterror.c
+       ${COMPILE_ET} -p ${PTSERVER} pterror
 
 prerror.h: pterror.h
        ${INSTALL} $? $@