From: Michael Meffie <mmeffie@sinenomine.net>
Date: Sun, 19 Jan 2014 22:04:08 +0000 (-0500)
Subject: libafs: separate source and header compile_et rules
X-Git-Tag: openafs-stable-1_8_0pre1~680
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=4e6b7ab904d38d38da1b80a7342bd815668a8c09

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.

Change-Id: I4e93691dda34ddc8600d6a818503e0c9e75e618a
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>
---

diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in
index c407c01..ccb9265 100644
--- a/src/afs/Makefile.in
+++ b/src/afs/Makefile.in
@@ -16,14 +16,17 @@ all: depinstall
 
 generated: afs_trace.h afs_trace.msf unified_afs.c unified_afs.h
 
-afs_trace.msf afs_trace.h: afs_trace.et
-	${COMPILE_ET} -v 2 -p ${srcdir} afs_trace.et
-afs_trace.h: afs_trace.msf
+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
-unified_afs.h: unified_afs.c
+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
@@ -46,7 +49,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} $? $@
@@ -72,7 +76,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
@@ -83,6 +90,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*) \
@@ -92,7 +100,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
@@ -102,6 +110,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*) \