From: Simon Wilkinson <sxw@your-file-system.com>
Date: Mon, 21 Feb 2011 00:29:33 +0000 (+0000)
Subject: budb: Only have one build rule for budb_errs.c
X-Git-Tag: openafs-devel-1_7_1~905
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=0d0b5048a5b68d4079b13609775f9234183d1947

budb: Only have one build rule for budb_errs.c

budb had two build rules that could produce budb_errs.c, but only
one of them also produced budb_client.h. This led to problems with
parallel makes, as depending on which rule fired first, budb_client.h
might, or might not, exist.

Rework all of this so that it's cleaner. Instead of producing two
copies of the error table, just make budb_client.h a static file,
and include the dynamically generated budb_errs.h from it. This
reduces code duplication, and means that we have to run compile_et
one less time.

Change-Id: Ib9b982454cc3f1ef3bdeb629c64dbb9901397fdb
Reviewed-on: http://gerrit.openafs.org/4027
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/budb/.gitignore b/src/budb/.gitignore
index 1427515..d812870 100644
--- a/src/budb/.gitignore
+++ b/src/budb/.gitignore
@@ -3,7 +3,6 @@
 # to check that you haven't inadvertently ignored any tracked files.
 
 /budb.h
-/budb_client.h
 /budb_errs.c
 /budb_errs.h
 /budb_server
diff --git a/src/budb/Makefile.in b/src/budb/Makefile.in
index d0fd89c..ed21f6a 100644
--- a/src/budb/Makefile.in
+++ b/src/budb/Makefile.in
@@ -26,6 +26,8 @@ INCLS=\
 	${TOP_INCDIR}/afs/cellconfig.h \
 	${TOP_INCDIR}/afs/com_err.h \
 	${TOP_INCDIR}/afs/bubasics.h \
+	${TOP_INCDIR}/afs/budb_client.h \
+	${TOP_INCDIR}/afs/budb_errs.h \
 	budb.h budb_client.h database.h
 
 # library ordering defined by top level makefile
@@ -53,7 +55,7 @@ SERVER_OBJS = ${COMMON_OBJS} budb.ss.o budb.xdr.o dbs_dump.o db_lock.o db_text.o
 all: ${TOP_LIBDIR}/libbudb.a ${TOP_INCDIR}/afs/budb.h ${TOP_INCDIR}/afs/budb_errs.h ${TOP_INCDIR}/afs/budb_prototypes.h budb_server
 
 generated: \
-	budb_errs.c budb_errs.h budb_client.h \
+	budb_errs.c budb_errs.h \
 	budb.cs.c budb.ss.c budb.xdr.c budb.h
 
 ${TOP_LIBDIR}/libbudb.a: libbudb.a
@@ -63,7 +65,7 @@ ${TOP_INCDIR}/afs/budb.h: budb.h
 	${INSTALL_DATA} $? $@
 
 ${TOP_INCDIR}/afs/budb_errs.h: budb_errs.h
-	${INSTALL_DATA} $? $@
+	${INSTALL_DATA} budb_errs.h $@
 
 ${TOP_INCDIR}/afs/budb_client.h: budb_client.h
 	${INSTALL_DATA} $? $@
@@ -71,18 +73,10 @@ ${TOP_INCDIR}/afs/budb_client.h: budb_client.h
 ${TOP_INCDIR}/afs/budb_prototypes.h: budb_prototypes.h
 	${INSTALL_DATA} $? $@
 
-#
-# budb_errs.o actually depends on neither budb_client.h nor budb_errs.h
-# but generating either of them will rebuild budb_errs.c
-#
-budb_errs.o: budb_errs.c budb_client.h budb_errs.h
-
-budb_client.h: budb_errs.c
-
-budb_errs.c: budb_errs.et budb_client.p.h
-	$(RM) -f budb_client.h budb_errs.c; ${COMPILE_ET} -p ${srcdir} budb_errs -h budb_client
+budb_errs.h: budb_errs.c
 
-budb_errs.h: budb_errs.et
+budb_errs.c: budb_errs.et
+	$(RM) -f budb_errs.c
 	${COMPILE_ET} -p ${srcdir} budb_errs
 
 database.o: database.c budb_errs.h globals.h ${INCLS}
@@ -93,7 +87,7 @@ db_text.o:  db_text.c budb_errs.h ${INCLS}
 db_hash.o: db_hash.c budb_errs.h ${INCLS}
 ol_verify.o:	ol_verify.c budb_errs.h ${INCLS}
 procs.o: procs.c budb_errs.h globals.h ${INCLS}
-struct_ops.o: budb_errs.h ${TOP_INCDIR}/afs/budb_client.h
+struct_ops.o: budb_errs.h ${INCLS}
 server.o: server.c budb_errs.h ${INCLS} AFS_component_version_number.c
 
 budb_server: $(SERVER_OBJS) ${LIBS} ${TOP_INCDIR}/afs/budb_client.h
@@ -147,7 +141,7 @@ dest: libbudb.a budb.h budb_errs.h budb_client.h budb_server
 # Misc targets
 #
 clean:
-	$(RM) -f *.o *~ budb_errs.[ch] budb.h budb_client.h *.a *.xdr.c \
+	$(RM) -f *.o *~ budb_errs.[ch] budb.h *.a *.xdr.c \
 		*.ss.c *.cs.c core budb_server AFS_component_version_number.c
 
 include ../config/Makefile.version
diff --git a/src/budb/budb_client.p.h b/src/budb/budb_client.h
similarity index 98%
rename from src/budb/budb_client.p.h
rename to src/budb/budb_client.h
index 9088fec..ce5e234 100644
--- a/src/budb/budb_client.p.h
+++ b/src/budb/budb_client.h
@@ -17,6 +17,7 @@
 #include <afs/budb.h>
 #endif
 
+#include <afs/budb_errs.h>
 
 /* for ubik_Call_SingleServer */