libafs: separate source and header compile_et rules

Use the new compile_et -emit flag to generate source and header
files separately to support parallel make.

Export afs_trace.h since it is required to build libafs.  Before the
compile_et -emit flag was available, The afs_trace.h file was
generated as a side-effect of creating afszcm.cat.

Reviewed-on: http://gerrit.openafs.org/10729
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: D Brashear <shadow@your-file-system.com>
(cherry picked from commit 4e6b7ab904d38d38da1b80a7342bd815668a8c09)

Change-Id: Ic1474aff86e49d8df0ba151ed0e53932aa96d1ed
Reviewed-on: http://gerrit.openafs.org/11239
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in
index dca92f88efceb41281b509cd52ab458979dd568b..2f6450e94104bec8077a9daab7bc35c839cbad29 100644 (file)
--- a/src/afs/Makefile.in
+++ b/src/afs/Makefile.in
@@ -18,12 +18,17 @@ all: depinstall
 
 generated: afs_trace.h afs_trace.msf unified_afs.c unified_afs.h
 
-afs_trace.h afs_trace.msf: afs_trace.et
-       ${COMPILE_ET} -v 2 -p ${srcdir} afs_trace.et
+afs_trace.h: afs_trace.et
+       ${COMPILE_ET_H} -v 2 -p ${srcdir} afs_trace.et
 
-unified_afs.c unified_afs.h: unified_afs.et
-       $(RM) -f unified_afs.c unified_afs.h
-       ${COMPILE_ET} -p ${srcdir} unified_afs -h unified_afs
+afs_trace.msf: afs_trace.et
+       ${COMPILE_ET_C} -v 2 -p ${srcdir} afs_trace.et
+
+unified_afs.h: unified_afs.et unified_afs.p.h
+       ${COMPILE_ET_H} -p ${srcdir} unified_afs -h unified_afs
+
+unified_afs.c: unified_afs.et
+       ${COMPILE_ET_C} -p ${srcdir} unified_afs
 
 afszcm.cat: afs_trace.msf
        -$(RM) -f afszcm.cat
@@ -48,7 +53,8 @@ depinstall: afszcm.cat AFS_component_version_number.c \
        ${TOP_INCDIR}/afs/exporter.h \
        ${TOP_INCDIR}/afs/nfsclient.h \
        ${TOP_INCDIR}/afs/unified_afs.h \
-       ${TOP_INCDIR}/afs/sysctl.h
+       ${TOP_INCDIR}/afs/sysctl.h \
+       ${TOP_INCDIR}/afs/afs_trace.h
 
 ${TOP_INCDIR}/afs/afs_consts.h: afs_consts.h
        ${INSTALL_DATA} $? $@
@@ -74,7 +80,10 @@ ${TOP_INCDIR}/afs/sysctl.h: sysctl.h
 ${TOP_INCDIR}/afs/unified_afs.h: unified_afs.h
        ${INSTALL_DATA} $? $@
 
-install: unified_afs.h
+${TOP_INCDIR}/afs/afs_trace.h: afs_trace.h
+       ${INSTALL_DATA} $? $@
+
+install: unified_afs.h afs_trace.h
        ${INSTALL} -d ${DESTDIR}${includedir}/afs
        ${INSTALL_DATA} ${srcdir}/afs.h ${DESTDIR}${includedir}/afs/afs.h
        ${INSTALL_DATA} ${srcdir}/afs_consts.h ${DESTDIR}${includedir}/afs/afs_consts.h
@@ -85,6 +94,7 @@ install: unified_afs.h
            ${DESTDIR}${includedir}/afs/osi_inode.h
        ${INSTALL_DATA} ${srcdir}/sysctl.h ${DESTDIR}${includedir}/afs/sysctl.h
        ${INSTALL_DATA} unified_afs.h ${DESTDIR}${includedir}/afs/unified_afs.h
+       ${INSTALL_DATA} afs_trace.h ${DESTDIR}${includedir}/afs/afs_trace.h
        ${INSTALL_DATA} afszcm.cat ${DESTDIR}${afsdatadir}/C/afszcm.cat
        case ${SYS_NAME} in \
            *linux*) \
@@ -94,7 +104,7 @@ install: unified_afs.h
                echo No vfs headers to install for ${SYS_NAME};; \
        esac
 
-dest: unified_afs.h
+dest: unified_afs.h afs_trace.h
        ${INSTALL} -d ${DEST}/include/afs
        ${INSTALL_DATA} ${srcdir}/afs.h ${DEST}/include/afs/afs.h
        ${INSTALL_DATA} ${srcdir}/afs_consts.h ${DEST}/include/afs/afs_consts.h
@@ -104,6 +114,7 @@ dest: unified_afs.h
        ${INSTALL_DATA} ${srcdir}/${MKAFS_OSTYPE}/osi_inode.h ${DEST}/include/afs/osi_inode.h
        ${INSTALL_DATA} ${srcdir}/sysctl.h ${DEST}/include/afs/sysctl.h
        ${INSTALL_DATA} unified_afs.h ${DEST}/include/afs/unified_afs.h
+       ${INSTALL_DATA} afs_trace.h ${DEST}/include/afs/afs_trace.h
        ${INSTALL_DATA} afszcm.cat ${DEST}/root.client/usr/vice/etc/C/afszcm.cat
        case ${SYS_NAME} in \
            *linux*) \