objdir build: Normalize COMPILE_ET_* commands

A few different places in the tree currently invoke compile_et in a
few different ways. These three general styles all appear:

    ${COMPILE_ET_H} -p ${srcdir} foo
    ${COMPILE_ET_H} -p ${srcdir} foo.et
    ${COMPILE_ET_H} ${srcdir}/foo.et

Of these, the first is the correct way to invoke compile_et in a
Makefile. The other two can fail during at least some objdir builds.

Take this example of the second style of invocation:

    afs_trace.h: afs_trace.et
            ${COMPILE_ET_H} -v 2 -p ${srcdir} afs_trace.et

During an objdir build, the compile_et command will get expanded like
so, due to VPATH expansion:

    $top_objdir/src/comerr/compile_et -emit h -v 2 \
        -p $top_srcdir/src/afs \
        $top_srcdir/src/afs/afs_trace.et

The compile_et command concatenates the -p prefix with the actual
filename provided, so the file it tries to open is:

    $top_srcdir/src/afs/$top_srcdir/src/afs/afs_trace.et

For non-objdir builds this doesn't happen, since $srcdir is just '.',
and afs_trace.et gets expanded to just afs_trace.et (or possibly
./afs_trace.et). This is also not a problem for objdir builds that are
specified as a relative path and are 'adjacent' to the srcdir. For
example, if we ran '../openafs-1.6.10pre1/configure --options', our
$top_srcdir is just '../openafs-1.6.10pre1', with some magic to
expand '..' to the correct number of levels. So in the above example,
the compile_et invocation gets expanded to:

    /path/to/objdir/src/comerr/compile_et -emit h -v 2 \
        -p ../../../openafs-1.6.10pre1/src/afs \
        ../../../openafs-1.6.10pre1/src/afs/afs_trace.et

And compile_et then tries to open the path
../../../openafs-1.6.10pre1/src/afs/../../../openafs-1.6.10pre1/src/afs/afs_trace.et
which collapses to just
../../../openafs-1.6.10pre1/src/afs/afs_trace.et, which is the correct
file.

However, if the $srcdir is specified as an absolute path, or if the
number of '..'s is wrong, this doesn't work. It is perhaps easiest to
explain why by just using another example. For an absolute path, the
invoked command is:

    /path/to/objdir/src/comerr/compile_et -emit h -v 2 \
        -p /path/to/openafs-1.6.10pre1/src/afs \
        /path/to/openafs-1.6.10pre1/src/afs/afs_trace.et

And compile_et tries to open
/path/to/openafs-1.6.10pre1/src/afs/path/to/openafs-1.6.10pre1/src/afs/afs_trace.et,
which obviously does not exist. This results in a build failure like:

    /path/to/openafs-1.6.10pre1/src/afs/path/to/openafs-1.6.10pre1/src/afs/afs_trace.et: No such file or directory
    *** Error code 1
    make: Fatal error: Command failed for target `afs_trace.msf'

For a non-working relative objdir, we may invoke a command like this:

    /path/to/objdir/src/comerr/compile_et -emit h -v 2 \
        -p ../../../../openafs-1.6.10pre1/src/afs \
        ../../../../openafs-1.6.10pre1/src/afs/afs_trace.et

And compile_et tries to open
../../../../openafs-1.6.10pre1/src/afs/../../../../openafs-1.6.10pre1/src/afs/afs_trace.et,
which is ../../../../../openafs-1.6.10pre1/src/afs/afs_trace.et, which
(probably) doesn't exist, since it goes one too many levels up.

To avoid this, we can just prevent the filename argument to compile_et
from undergoing VPATH expansion. compile_et never opens the given path
directly if -p is given, so it's not really a file path and so should
not be altered by VPATH.

compile_et will add a trailing .et to the filename if it doesn't have
one, so we can avoid the VPATH expansion by just leaving out the
trailing .et. We could also avoid the VPATH expansion by specifying
something like './afs_trace.et', but it is perhaps more clear to not
say the explicit filename, since we're not really specifying a path to
a file.

Just leaving out the -p option, as in this style of compile_et
invocation:

    dumpscan_errs.h: ${srcdir}/dumpscan_errs.et
        $(COMPILE_ET_H) ${srcdir}/dumpscan_errs.et

also fails for objdir builds. This is because, without the -p option,
compile_et defaults to '.' as the prefix. If the srcdir is
/path/to/openafs-1.6.10pre1, then this will expand to:

    /path/to/objdir/src/comerr/compile_et -emit h \
        .//path/to/openafs-1.6.10pre1/src/tools/dumpscan/dumpscan_errs.et

which will fail, since that path to dumpscan_errs.et does not exist.

So to fix this, make all compile_et invocations follow this style:

    ${COMPILE_ET_H} -p ${srcdir} foo

Many other invocations of compile_et in the tree are already like
this, so this commit just changes the others to match.

Change-Id: Ied12e07a1cc6e115d4a10cd7a6c97aae9ce7f5f9
Reviewed-on: http://gerrit.openafs.org/11391
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>

diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in
index ccb9265..dc19208 100644 (file)
--- a/src/afs/Makefile.in
+++ b/src/afs/Makefile.in
@@ -17,10 +17,10 @@ all: depinstall
 generated: afs_trace.h afs_trace.msf unified_afs.c unified_afs.h
 
 afs_trace.h: afs_trace.et
-       ${COMPILE_ET_H} -v 2 -p ${srcdir} afs_trace.et
+       ${COMPILE_ET_H} -v 2 -p ${srcdir} afs_trace
 
 afs_trace.msf: afs_trace.et
-       ${COMPILE_ET_C} -v 2 -p ${srcdir} afs_trace.et
+       ${COMPILE_ET_C} -v 2 -p ${srcdir} afs_trace
 
 unified_afs.h: unified_afs.et unified_afs.p.h
        ${COMPILE_ET_H} -p ${srcdir} unified_afs -h unified_afs

diff --git a/src/libadmin/adminutil/Makefile.in b/src/libadmin/adminutil/Makefile.in
index 7935c23..f819663 100644 (file)
--- a/src/libadmin/adminutil/Makefile.in
+++ b/src/libadmin/adminutil/Makefile.in
@@ -44,90 +44,90 @@ ${TOP_INCDIR}/afs/afs_AdminErrors.h: afs_AdminErrors.h
 
 
 afs_AdminBosErrors.h: afs_AdminBosErrors.et
-       ${COMPILE_ET_H} -p ${srcdir} afs_AdminBosErrors.et
+       ${COMPILE_ET_H} -p ${srcdir} afs_AdminBosErrors
 
 afs_AdminBosErrors.c: afs_AdminBosErrors.et
-       ${COMPILE_ET_C} -p ${srcdir} afs_AdminBosErrors.et
+       ${COMPILE_ET_C} -p ${srcdir} afs_AdminBosErrors
 
 ${TOP_INCDIR}/afs/afs_AdminBosErrors.h: afs_AdminBosErrors.h
        ${INSTALL_DATA} $? $@
 
 
 afs_AdminCfgErrors.h: afs_AdminCfgErrors.et
-       ${COMPILE_ET_H} -p ${srcdir} afs_AdminCfgErrors.et
+       ${COMPILE_ET_H} -p ${srcdir} afs_AdminCfgErrors
 
 afs_AdminCfgErrors.c: afs_AdminCfgErrors.et
-       ${COMPILE_ET_C} -p ${srcdir} afs_AdminCfgErrors.et
+       ${COMPILE_ET_C} -p ${srcdir} afs_AdminCfgErrors
 
 ${TOP_INCDIR}/afs/afs_AdminCfgErrors.h: afs_AdminCfgErrors.h
        ${INSTALL_DATA} $? $@
 
 
 afs_AdminClientErrors.h: afs_AdminClientErrors.et
-       ${COMPILE_ET_H} -p ${srcdir} afs_AdminClientErrors.et
+       ${COMPILE_ET_H} -p ${srcdir} afs_AdminClientErrors
 
 afs_AdminClientErrors.c: afs_AdminClientErrors.et
-       ${COMPILE_ET_C} -p ${srcdir} afs_AdminClientErrors.et
+       ${COMPILE_ET_C} -p ${srcdir} afs_AdminClientErrors
 
 ${TOP_INCDIR}/afs/afs_AdminClientErrors.h: afs_AdminClientErrors.h
        ${INSTALL_DATA} $? $@
 
 
 afs_AdminMiscErrors.h: afs_AdminMiscErrors.et
-       ${COMPILE_ET_H} -p ${srcdir} afs_AdminMiscErrors.et
+       ${COMPILE_ET_H} -p ${srcdir} afs_AdminMiscErrors
 
 afs_AdminMiscErrors.c: afs_AdminMiscErrors.et
-       ${COMPILE_ET_C} -p ${srcdir} afs_AdminMiscErrors.et
+       ${COMPILE_ET_C} -p ${srcdir} afs_AdminMiscErrors
 
 ${TOP_INCDIR}/afs/afs_AdminMiscErrors.h: afs_AdminMiscErrors.h
        ${INSTALL_DATA} $? $@
 
 
 afs_AdminCommonErrors.h: afs_AdminCommonErrors.et
-       ${COMPILE_ET_H} -p ${srcdir} afs_AdminCommonErrors.et
+       ${COMPILE_ET_H} -p ${srcdir} afs_AdminCommonErrors
 
 afs_AdminCommonErrors.c: afs_AdminCommonErrors.et
-       ${COMPILE_ET_C} -p ${srcdir} afs_AdminCommonErrors.et
+       ${COMPILE_ET_C} -p ${srcdir} afs_AdminCommonErrors
 
 ${TOP_INCDIR}/afs/afs_AdminCommonErrors.h: afs_AdminCommonErrors.h
        ${INSTALL_DATA} $? $@
 
 
 afs_AdminKasErrors.h: afs_AdminKasErrors.et
-       ${COMPILE_ET_H} -p ${srcdir} afs_AdminKasErrors.et
+       ${COMPILE_ET_H} -p ${srcdir} afs_AdminKasErrors
 
 afs_AdminKasErrors.c: afs_AdminKasErrors.et
-       ${COMPILE_ET_C} -p ${srcdir} afs_AdminKasErrors.et
+       ${COMPILE_ET_C} -p ${srcdir} afs_AdminKasErrors
 
 ${TOP_INCDIR}/afs/afs_AdminKasErrors.h: afs_AdminKasErrors.h
        ${INSTALL_DATA} $? $@
 
 
 afs_AdminPtsErrors.h: afs_AdminPtsErrors.et
-       ${COMPILE_ET_H} -p ${srcdir} afs_AdminPtsErrors.et
+       ${COMPILE_ET_H} -p ${srcdir} afs_AdminPtsErrors
 
 afs_AdminPtsErrors.c: afs_AdminPtsErrors.et
-       ${COMPILE_ET_C} -p ${srcdir} afs_AdminPtsErrors.et
+       ${COMPILE_ET_C} -p ${srcdir} afs_AdminPtsErrors
 
 ${TOP_INCDIR}/afs/afs_AdminPtsErrors.h: afs_AdminPtsErrors.h
        ${INSTALL_DATA} $? $@
 
 
 afs_AdminUtilErrors.h: afs_AdminUtilErrors.et
-       ${COMPILE_ET_H} -p ${srcdir} afs_AdminUtilErrors.et
+       ${COMPILE_ET_H} -p ${srcdir} afs_AdminUtilErrors
 
 afs_AdminUtilErrors.c: afs_AdminUtilErrors.et
-       ${COMPILE_ET_C} -p ${srcdir} afs_AdminUtilErrors.et
+       ${COMPILE_ET_C} -p ${srcdir} afs_AdminUtilErrors
 
 ${TOP_INCDIR}/afs/afs_AdminUtilErrors.h: afs_AdminUtilErrors.h
        ${INSTALL_DATA} $? $@
 
 
 afs_AdminVosErrors.h: afs_AdminVosErrors.et
-       ${COMPILE_ET_H} -p ${srcdir} afs_AdminVosErrors.et
+       ${COMPILE_ET_H} -p ${srcdir} afs_AdminVosErrors
 
 afs_AdminVosErrors.c: afs_AdminVosErrors.et
-       ${COMPILE_ET_C} -p ${srcdir} afs_AdminVosErrors.et
+       ${COMPILE_ET_C} -p ${srcdir} afs_AdminVosErrors
 
 ${TOP_INCDIR}/afs/afs_AdminVosErrors.h: afs_AdminVosErrors.h
        ${INSTALL_DATA} $? $@

diff --git a/src/tools/dumpscan/Makefile.in b/src/tools/dumpscan/Makefile.in
index 0420508..89b2189 100644 (file)
--- a/src/tools/dumpscan/Makefile.in
+++ b/src/tools/dumpscan/Makefile.in
@@ -73,10 +73,10 @@ libdumpscan.a: $(OBJS_libdumpscan.a)
        $(RANLIB) libdumpscan.a
 
 xf_errs.c: ${srcdir}/xf_errs.et
-       $(COMPILE_ET_C) ${srcdir}/xf_errs.et
+       $(COMPILE_ET_C) -p ${srcdir} xf_errs
 
 xf_errs.h: ${srcdir}/xf_errs.et
-       $(COMPILE_ET_H) ${srcdir}/xf_errs.et
+       $(COMPILE_ET_H) -p ${srcdir} xf_errs
 
 afsdump_dirlist.o: xf_errs.h
 afsdump_extract.o: xf_errs.h
@@ -91,10 +91,10 @@ xf_profile.o: xf_errs.h
 xf_rxcall.o: xf_errs.h
 
 dumpscan_errs.h: ${srcdir}/dumpscan_errs.et
-       $(COMPILE_ET_H) ${srcdir}/dumpscan_errs.et
+       $(COMPILE_ET_H) -p ${srcdir} dumpscan_errs
 
 dumpscan_errs.c: ${srcdir}/dumpscan_errs.et
-       $(COMPILE_ET_C) ${srcdir}/dumpscan_errs.et
+       $(COMPILE_ET_C) -p ${srcdir} dumpscan_errs
 
 afsdump_dirlist.o: dumpscan_errs.h
 afsdump_extract.o: dumpscan_errs.h