Unix: Rework build system

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

diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in
index 051a8a8..e7f5f24 100644 (file)
--- a/src/tvlserver/Makefile.in
+++ b/src/tvlserver/Makefile.in
@@ -7,6 +7,8 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.pthread
+
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -14,13 +16,9 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 HELPER_SPLINT=@HELPER_SPLINT@
 ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@
 
-CC=${MT_CC}
-CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} 
-CCRULE=${CC} ${CFLAGS} -c
-
-RX=../rx
-UTIL=../util
-VLSERVER=../vlserver
+RX=$(srcdir)/../rx
+UTIL=$(srcdir)/../util
+VLSERVER=$(srcdir)/../vlserver
 
 RXOBJS= rx_pthread.o rxkad_errs.o
 
@@ -53,10 +51,10 @@ all: \
 depinstall:
 
 rx_pthread.o: ${RX}/rx_pthread.c
-       ${CCRULE} ${srcdir}/${RX}/rx_pthread.c
+       $(AFS_CCRULE) $(RX)/rx_pthread.c
 
 rxkad_errs.o: ../rxkad/rxkad_errs.c
-       ${CCRULE} ../rxkad/rxkad_errs.c
+       $(AFS_CCRULE) ../rxkad/rxkad_errs.c
 
 #
 # get the pthreaded util stuff compiled here.  we do this instead of
@@ -65,43 +63,43 @@ rxkad_errs.o: ../rxkad/rxkad_errs.c
 #
 
 assert.o: ${UTIL}/assert.c
-       ${CCRULE} ${srcdir}/${UTIL}/assert.c
+       $(AFS_CCRULE) $(UTIL)/assert.c
 
 uuid.o: ${UTIL}/uuid.c
-       ${CCRULE} ${srcdir}/${UTIL}/uuid.c
+       $(AFS_CCRULE) $(UTIL)/uuid.c
 
 serverLog.o: ${UTIL}/serverLog.c
-       ${CCRULE} ${srcdir}/${UTIL}/serverLog.c
+       $(AFS_CCRULE) $(UTIL)/serverLog.c
 
 fileutil.o: ${UTIL}/fileutil.c
-       ${CCRULE} ${srcdir}/${UTIL}/fileutil.c
+       $(AFS_CCRULE) $(UTIL)/fileutil.c
 
 volparse.o: ${UTIL}/volparse.c
-       ${CCRULE} ${srcdir}/${UTIL}/volparse.c
+       $(AFS_CCRULE) $(UTIL)/volparse.c
 
 flipbase64.o: ${UTIL}/flipbase64.c
-       ${CCRULE} ${srcdir}/${UTIL}/flipbase64.c
+       $(AFS_CCRULE) $(UTIL)/flipbase64.c
 
 netutils.o: ${UTIL}/netutils.c
-       ${CCRULE} ${srcdir}/${UTIL}/netutils.c
+       $(AFS_CCRULE) $(UTIL)/netutils.c
 
 dirpath.o: ${UTIL}/dirpath.c
-       ${CCRULE} ${srcdir}/${UTIL}/dirpath.c
+       $(AFS_CCRULE) $(UTIL)/dirpath.c
 
 softsig.o: ${UTIL}/softsig.c
-       ${CCRULE} ${srcdir}/${UTIL}/softsig.c
+       $(AFS_CCRULE) $(UTIL)/softsig.c
 
 hostparse.o: ${UTIL}/hostparse.c
-       ${CCRULE} ${srcdir}/${UTIL}/hostparse.c
+       $(AFS_CCRULE) $(UTIL)/hostparse.c
 
 snprintf.o: ${UTIL}/snprintf.c
-       ${CCRULE} ${srcdir}/${UTIL}/snprintf.c
+       $(AFS_CCRULE) $(UTIL)/snprintf.c
 
 pthread_glock.o: ${UTIL}/pthread_glock.c
-       ${CCRULE} ${srcdir}/${UTIL}/pthread_glock.c
+       $(AFS_CCRULE) $(UTIL)/pthread_glock.c
 
 get_krbrlm.o: ${UTIL}/get_krbrlm.c
-       ${CCRULE} ${srcdir}/${UTIL}/get_krbrlm.c
+       $(AFS_CCRULE) $(UTIL)/get_krbrlm.c
 
 #
 # Other stuff
@@ -109,44 +107,41 @@ get_krbrlm.o: ${UTIL}/get_krbrlm.c
 
 
 vldb_check: vldb_check.o ${LIBS} AFS_component_version_number.o
-       $(CC) ${LDFLAGS} -o vldb_check vldb_check.o AFS_component_version_number.o ${LIBS} ${MT_LIBS} ${XLIBS} 
+       $(AFS_LDRULE) vldb_check.o AFS_component_version_number.o \
+               ${LIBS} ${MT_LIBS} ${XLIBS} 
 
 vldb_check.o: ${VLSERVER}/vldb_check.c 
-       ${CCRULE} ${srcdir}/${VLSERVER}/vldb_check.c
+       $(AFS_CCRULE) $(VLSERVER)/vldb_check.c
 
 cnvldb: cnvldb.o ${LIBS} 
-       $(CC) ${LDFLAGS} -o cnvldb cnvldb.o ${LIBS} ${MT_LIBS} ${XLIBS}
+       $(AFS_LDRULE) cnvldb.o ${LIBS} ${MT_LIBS} ${XLIBS}
 
 cnvldb.o: ${VLSERVER}/cnvldb.c
-       ${CCRULE} ${srcdir}/${VLSERVER}/cnvldb.c
+       $(AFS_CCRULE) $(VLSERVER)/cnvldb.c
 
 sascnvldb: sascnvldb.o ${LIBS} 
-       $(CC) ${LDFLAGS} -o sascnvldb sascnvldb.o ${LIBS} ${MT_LIBS} ${XLIBS}
+       $(AFS_LDRULE) sascnvldb.o ${LIBS} ${MT_LIBS} ${XLIBS}
 
 sascnvldb.o: ${VLSERVER}/sascnvldb.c
-       ${CCRULE} ${srcdir}/${VLSERVER}/sascnvldb.c
+       $(AFS_CCRULE) $(VLSERVER)/sascnvldb.c
 
 vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS)
-       $(CC) ${LDFLAGS} -o vlserver vlserver.o vlutils.o vlprocs.o vldbint.ss.o \
-               vldbint.xdr.o $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libaudit.a
+       $(AFS_LDRULE) vlserver.o vlutils.o vlprocs.o vldbint.ss.o \
+               vldbint.xdr.o $(LIBS) ${MT_LIBS} ${XLIBS} \
+               ${TOP_LIBDIR}/libaudit.a
 
 vlserver.o: ${VLSERVER}/vlserver.c ${INCLS} AFS_component_version_number.o
-       ${CCRULE} ${srcdir}/${VLSERVER}/vlserver.c
+       $(AFS_CCRULE) $(VLSERVER)/vlserver.c
 
 vlutils.o: ${VLSERVER}/vlutils.c ${INCLS}
-       ${CCRULE} ${srcdir}/${VLSERVER}/vlutils.c
+       $(AFS_CCRULE) $(VLSERVER)/vlutils.c
 
 vlprocs.o: ${VLSERVER}/vlprocs.c ${INCLS}
-       ${CCRULE} ${srcdir}/${VLSERVER}/vlprocs.c
+       $(AFS_CCRULE) $(VLSERVER)/vlprocs.c
 
 vldbint.ss.o: vldbint.ss.c 
-       ${CCRULE} vldbint.ss.c
-
 vldbint.cs.o: vldbint.cs.c 
-       ${CCRULE} vldbint.cs.c
-
 vldbint.xdr.o: vldbint.xdr.c 
-       ${CCRULE} vldbint.xdr.c
 
 vldbint.cs.c: ${VLSERVER}/vldbint.xg
        ${RXGEN} -A -u -x -C -o $@ ${srcdir}/${VLSERVER}/vldbint.xg
@@ -171,13 +166,13 @@ Kvldbint.xdr.c: ${VLSERVER}/vldbint.xg
        ${RXGEN} -A -x -k -c -o $@ ${srcdir}/${VLSERVER}/vldbint.xg
 
 vlclient: vlclient.o $(OBJS) $(LIBS) ${INCLS}
-       $(CC) ${LDFLAGS} -o vlclient vlclient.o $(OBJS) $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libcmd.a
+       $(AFS_LDRULE) vlclient.o $(OBJS) $(LIBS) ${MT_LIBS} ${XLIBS} \
+               ${TOP_LIBDIR}/libcmd.a
 
 vlclient.o: ${VLSERVER}/vlclient.c
-       ${CCRULE} ${srcdir}/${VLSERVER}/vlclient.c
+       $(AFS_CCRULE) $(VLSERVER)/vlclient.c
 
 vl_errors.o: vl_errors.c
-       ${CCRULE} vl_errors.c
 
 vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h
        $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${srcdir}/${VLSERVER} vl_errors -h vlserver