From 61453d8f33f6508f8464ffba0657aefb6c7eae3b Mon Sep 17 00:00:00 2001
From: Andrew Deason <adeason@sinenomine.net>
Date: Mon, 21 Feb 2011 13:49:59 -0600
Subject: [PATCH] Fix budb build rules for tbudb and WINNT

Commit 0d0b5048a5b68d4079b13609775f9234183d1947 only fixed the budb
Makefile.in. Make the analagous changes to tbudb/Makefile.in and
NTMakefile.

Change-Id: I4fa00e630aafcfa9d4d41a1948f3eae750900526
Reviewed-on: http://gerrit.openafs.org/4029
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---
 src/budb/NTMakefile   | 13 ++++++-------
 src/tbudb/.gitignore  |  1 -
 src/tbudb/Makefile.in | 20 ++++++++------------
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/budb/NTMakefile b/src/budb/NTMakefile
index 2299d2b..fb01a1a 100644
--- a/src/budb/NTMakefile
+++ b/src/budb/NTMakefile
@@ -114,14 +114,13 @@ $(INCFILEDIR)\budb.h: budb.h
 
 ############################################################################
 # compile_et on budb_errs.et
-$(INCFILEDIR)\budb_errs.h : budb_errs.et
-	$(COMPILE_ET) budb_errs -h budb_errs
+
+$(INCFILEDIR)\budb_errs.h: budb_errs.c
 	$(COPY) budb_errs.h $(INCFILEDIR)\budb_errs.h
 
-budb_errs.c $(INCFILEDIR)\budb_client.h: budb_errs.et budb_client.p.h
-	$(DEL) budb_client.h budb_errs.c
-	$(COMPILE_ET) budb_errs -h budb_client
-	$(COPY) budb_client.h $(INCFILEDIR)\budb_client.h
+budb_errs.c: budb_errs.et
+	$(DEL) budb_errs.c
+	$(COMPILE_ET) budb_errs
 
 ############################################################################
 # install 
@@ -134,7 +133,7 @@ install: $(INCFILES) $(LIBFILE) $(EXEFILE)
 
 clean::
         $(DEL) $(INCFILES)
-	$(DEL) budb_errs.c budb_errs.h budb.h budb_client.h	
+	$(DEL) budb_errs.c budb_errs.h budb.h
 	$(DEL) budb.cs.c budb.ss.c budb.xdr.c
 
 mkdir:
diff --git a/src/tbudb/.gitignore b/src/tbudb/.gitignore
index 1427515..d812870 100644
--- a/src/tbudb/.gitignore
+++ b/src/tbudb/.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/tbudb/Makefile.in b/src/tbudb/Makefile.in
index 003f378..191c2b8 100644
--- a/src/tbudb/Makefile.in
+++ b/src/tbudb/Makefile.in
@@ -37,7 +37,9 @@ INCLS=\
 	${TOP_INCDIR}/afs/cellconfig.h \
 	${TOP_INCDIR}/afs/com_err.h \
 	${TOP_INCDIR}/afs/bubasics.h \
-	budb.h budb_client.h
+	${TOP_INCDIR}/afs/budb_client.h \
+	${TOP_INCDIR}/afs/budb_errs.h \
+	budb.h $(BUDB)/budb_client.h
 
 # library ordering defined by top level makefile
 LIBS=${RXOBJS} ${UTILOBJS} \
@@ -55,16 +57,10 @@ 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_client.h budb_server ${INCLS}
 
-#
-# 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_errs.c budb_client.h: ${BUDB}/budb_errs.et ${BUDB}/budb_client.p.h
-	$(RM) -f budb_client.h budb_errs.c; ${COMPILE_ET} -p ${srcdir}/${BUDB} budb_errs -h budb_client
+budb_errs.h: budb_errs.c
 
-budb_errs.h: ${BUDB}/budb_errs.et
+budb_errs.c: ${BUDB}/budb_errs.et
+	$(RM) -f budb_errs.c
 	${COMPILE_ET} -p ${srcdir}/${BUDB} budb_errs
 
 #
@@ -145,7 +141,7 @@ ol_verify.o: ${BUDB}/ol_verify.c budb_errs.h ${INCLS}
 procs.o: ${BUDB}/procs.c budb_errs.h ${INCLS}
 	$(AFS_CCRULE) $(BUDB)/procs.c
 
-struct_ops.o: ${BUDB}/struct_ops.c budb_errs.h ${TOP_INCDIR}/afs/budb_client.h
+struct_ops.o: ${BUDB}/struct_ops.c budb_errs.h ${INCLS}
 	$(AFS_CCRULE) $(BUDB)/struct_ops.c
 
 server.o: ${BUDB}/server.c budb_errs.h ${INCLS}
@@ -189,7 +185,7 @@ ${DEST}/root.server/usr/afs/bin/buserver: 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
-- 
1.9.4