Appease compile_et for objdir builds

The argument we pass to -p needs to be in the source tree, not
the object tree -- compile_et will not find the input files it
wants in the objdir tree.

For tbudb we can do this as is done on master, by just including
it in the local variable BUDB, but for tptserver and tvlserver
that is a rather invasive change.

This fixes the build with a separate objdir, which was broken by
commit 7c451fab11b65dd5e2860715b939e5de33c7645e.

Change-Id: If90f170ef3777a9987a0ba91747041abb89b2b65
Reviewed-on: http://gerrit.openafs.org/11435
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: D Brashear <shadow@your-file-system.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in
index 7ec75b1294431808b3dfe355c707562b81a9d850..94122df1c665af5a4908107086b88dbe6a7c87fb 100644 (file)
--- a/src/tbudb/Makefile.in
+++ b/src/tbudb/Makefile.in
@@ -18,7 +18,7 @@ CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c
 
 RX=../rx
 UTIL=../util
-BUDB=../budb
+BUDB=${srcdir}/../budb
 
 RXOBJS= rx_pthread.o rxkad_errs.o
 
@@ -166,16 +166,16 @@ budb_server: $(SERVER_OBJS) ${LIBS}
        ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
 
 budb.cs.c: ${BUDB}/budb.rg
-       ${RXGEN} -u -C -o $@ ${srcdir}/${BUDB}/budb.rg
+       ${RXGEN} -u -C -o $@ ${BUDB}/budb.rg
 
 budb.ss.c: ${BUDB}/budb.rg
-       ${RXGEN} -S -o $@ ${srcdir}/${BUDB}/budb.rg
+       ${RXGEN} -S -o $@ ${BUDB}/budb.rg
 
 budb.xdr.c: ${BUDB}/budb.rg
-       ${RXGEN} -c -o $@ ${srcdir}/${BUDB}/budb.rg
+       ${RXGEN} -c -o $@ ${BUDB}/budb.rg
 
 budb.h: ${BUDB}/budb.rg
-       ${RXGEN} -u -h -o $@ ${srcdir}/${BUDB}/budb.rg
+       ${RXGEN} -u -h -o $@ ${BUDB}/budb.rg
 
 budb.cs.c: budb.h
 budb.xdr.c: budb.h

diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in
index 3ec12324cb8528c071286046ebfda2da43362297..6d34f844a5da4a6d50d90ed44d6310a7fe5791b1 100644 (file)
--- a/src/tptserver/Makefile.in
+++ b/src/tptserver/Makefile.in
@@ -175,10 +175,10 @@ ptuser.o: ${PTSERVER}/ptuser.c ${INCLS}
        ${CCRULE} ${srcdir}/${PTSERVER}/ptuser.c
 
 pterror.c: ${PTSERVER}/pterror.et
-       ${COMPILE_ET_C} -p ${PTSERVER} pterror
+       ${COMPILE_ET_C} -p ${srcdir}/${PTSERVER} pterror
 
 pterror.h: ${PTSERVER}/pterror.et
-       ${COMPILE_ET_H} -p ${PTSERVER} pterror
+       ${COMPILE_ET_H} -p ${srcdir}/${PTSERVER} pterror
 
 db_verify.o: pterror.h
 ptclient.o: pterror.h

diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in
index 5f20e6a55f4856f38dbc35c29e4c05ca81142e71..1d600167d9b887e15df965fec3b7f4416603c99e 100644 (file)
--- a/src/tvlserver/Makefile.in
+++ b/src/tvlserver/Makefile.in
@@ -180,10 +180,10 @@ vl_errors.o: vl_errors.c
        ${CCRULE} vl_errors.c
 
 vl_errors.c: ${VLSERVER}/vl_errors.et
-       ${COMPILE_ET_C} -p ${VLSERVER} vl_errors
+       ${COMPILE_ET_C} -p ${srcdir}/${VLSERVER} vl_errors
 
 vlserver.h: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h
-       ${COMPILE_ET_H} -p ${VLSERVER} vl_errors -h vlserver
+       ${COMPILE_ET_H} -p ${srcdir}/${VLSERVER} vl_errors -h vlserver
 
 cnvldb.o: vlserver.h
 vlclient.o: vlserver.h