tubik: Fix objdir builds

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

diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in
index edfa677..38b6790 100644 (file)
--- a/src/tvlserver/Makefile.in
+++ b/src/tvlserver/Makefile.in
@@ -7,10 +7,16 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+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 $?
+CCRULE=${CC} ${CFLAGS} -c $<
 
 RX=../rx
 UTIL=../util
@@ -29,7 +35,7 @@ INCLS=${TOP_INCDIR}/ubik.h \
              ${TOP_INCDIR}/rx/xdr.h \
              ${TOP_INCDIR}/afs/keys.h \
              ${TOP_INCDIR}/afs/cellconfig.h \
-       vlserver.h ${VLSERVER}/vlclient.h vldbint.h
+       vlserver.h vldbint.h
 
 LIBS=  ${TOP_LIBDIR}/libubik_pthread.a \
        ${TOP_LIBDIR}/libafsauthent.a \
@@ -124,13 +130,13 @@ 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
 
-vlserver.o: ${VLSERVER}/vlserver.c 
+vlserver.o: ${VLSERVER}/vlserver.c ${INCLS} AFS_component_version_number.o
        ${CCRULE}
 
-vlutils.o: ${VLSERVER}/vlutils.c 
+vlutils.o: ${VLSERVER}/vlutils.c ${INCLS}
        ${CCRULE}
 
-vlprocs.o: ${VLSERVER}/vlprocs.c 
+vlprocs.o: ${VLSERVER}/vlprocs.c ${INCLS}
        ${CCRULE}
 
 vldbint.ss.o: vldbint.ss.c 
@@ -143,28 +149,28 @@ vldbint.xdr.o: vldbint.xdr.c
        ${CCRULE}
 
 vldbint.cs.c: ${VLSERVER}/vldbint.xg
-       ${RXGEN} -u -x -C -o $@ ${VLSERVER}/vldbint.xg
+       ${RXGEN} -A -u -x -C -o $@ ${srcdir}/${VLSERVER}/vldbint.xg
 
 vldbint.ss.c: ${VLSERVER}/vldbint.xg
-       ${RXGEN} -x -S -o $@ ${VLSERVER}/vldbint.xg
+       ${RXGEN} -A -x -S -o $@ ${srcdir}/${VLSERVER}/vldbint.xg
 
 vldbint.xdr.c: ${VLSERVER}/vldbint.xg
-       ${RXGEN} -x -c -o $@ ${VLSERVER}/vldbint.xg
+       ${RXGEN} -A -x -c -o $@ ${srcdir}/${VLSERVER}/vldbint.xg
 
 vldbint.h: ${VLSERVER}/vldbint.xg
-       ${RXGEN} -u -x -h -o $@ ${VLSERVER}/vldbint.xg
+       ${RXGEN} -A -u -x -h -o $@ ${srcdir}/${VLSERVER}/vldbint.xg
 
 vldbint.cs.c: vldbint.h
 vldbint.ss.c: vldbint.h
 vldbint.xdr.c: vldbint.h
 
 Kvldbint.cs.c: ${VLSERVER}/vldbint.xg
-       ${RXGEN} -x -k -C -o $@ ${VLSERVER}/vldbint.xg
+       ${RXGEN} -A -x -k -C -o $@ ${srcdir}/${VLSERVER}/vldbint.xg
 
 Kvldbint.xdr.c: ${VLSERVER}/vldbint.xg
-       ${RXGEN} -x -k -c -o $@ ${VLSERVER}/vldbint.xg
+       ${RXGEN} -A -x -k -c -o $@ ${srcdir}/${VLSERVER}/vldbint.xg
 
-vlclient: vlclient.o $(OBJS) $(LIBS) 
+vlclient: vlclient.o $(OBJS) $(LIBS) ${INCLS}
        $(CC) ${LDFLAGS} -o vlclient vlclient.o $(OBJS) $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libcmd.a
 
 vlclient.o: ${VLSERVER}/vlclient.c
@@ -174,37 +180,23 @@ vl_errors.o: vl_errors.c
        ${CCRULE}
 
 vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h
-       $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${srcdir} vl_errors -h vlserver
+       $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${srcdir}/${VLSERVER} vl_errors -h vlserver
 
 system: install
 
-${DEST}/root.server/usr/afs/bin/vlserver: vlserver
-       ${INSTALL} $? $@
-
-${DEST}/etc/vldb_convert: cnvldb
-       ${INSTALL} -f $? $@
-
-install: \
-       ${DESTDIR}${afssrvlibexecdir}/vlserver \
-       ${DESTDIR}${afssrvsbindir}/vldb_convert \
-       ${DESTDIR}${afssrvsbindir}/vldb_check
-
-${DESTDIR}${afssrvlibexecdir}/vlserver: vlserver
-       ${INSTALL} $? $@
-
-${DESTDIR}${afssrvsbindir}/vldb_convert: cnvldb
-       ${INSTALL} -f $? $@
-
-${DESTDIR}${afssrvsbindir}/vldb_check: vldb_check
-       ${INSTALL} $? $@
-
-dest: \
-       ${DEST}/root.server/usr/afs/bin/vlserver \
-       ${DEST}/etc/vldb_convert \
-       ${DEST}/etc/vldb_check
-
-${DEST}/etc/vldb_check: vldb_check
-       ${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; \
+       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; \
+       fi
 
 #
 # Misc targets