From ffe0757a5610d1fe6cf7e513d62ccc570d559206 Mon Sep 17 00:00:00 2001
From: Benjamin Kaduk <kaduk@mit.edu>
Date: Tue, 12 Aug 2014 15:13:46 -0400
Subject: [PATCH] Attempt to clean up tvolser dependencies

The volserver only needs vl_errors.c to be locally generated, not
vlserver.h; in fact, the only consumers of vlserver.h in src/volser/
consume it via afs/vlserver.h.

Instead of reaching over to ../volser for the generated volerr.c,
generate our own local copy, as well as the volser.h generated from
the same error table -- volser.h is included with double-quotes from
the volser sources.

Add the appropriate dependencies on volser.h, and remove the unneeded
dependencies on vlserver.h

Change-Id: Ic6e728fa455419cc8e95dc25c41ed6d6b7d20934
Reviewed-on: http://gerrit.openafs.org/11380
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
---
 src/tvolser/.gitignore  |    1 -
 src/tvolser/Makefile.in |   30 +++++++++++++++++++-----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/tvolser/.gitignore b/src/tvolser/.gitignore
index 1489aa0..d412854 100644
--- a/src/tvolser/.gitignore
+++ b/src/tvolser/.gitignore
@@ -3,7 +3,6 @@
 # to check that you haven't inadvertently ignored any tracked files.
 
 /vl_errors.c
-/vlserver.h
 /volserver
 /vos
 /volerr.c
diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index 88812b2..f11e696 100644
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -71,8 +71,8 @@ physio.o: ${VOLSER}/physio.c
 voltrans.o: ${VOLSER}/voltrans.c
 	$(AFS_CCRULE) -I../volser $(VOLSER)/voltrans.c
 
-volerr.o: ../volser/volerr.c
-	$(AFS_CCRULE) ../volser/volerr.c
+volerr.o: volerr.c
+	$(AFS_CCRULE) volerr.c
 
 volint.cs.o: ../volser/volint.cs.c
 	$(AFS_CCRULE) ../volser/volint.cs.c
@@ -92,15 +92,23 @@ lockprocs.o: ${VOLSER}/lockprocs.c
 vl_errors.c: ${VLSERVER}/vl_errors.et
 	${COMPILE_ET_C} -p ${VLSERVER} vl_errors
 
-vlserver.h: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h
-	${COMPILE_ET_H} -p ${VLSERVER} vl_errors -h vlserver
+volerr.c: ${VOLSER}/volerr.et
+	${COMPILE_ET_C} -p ${VOLSER} volerr
 
-cnvldb.o cnvldb.lo: vlserver.h
-vlclient.o vlclient.lo: vlserver.h
-vldb_check.o vldb_check.lo: vlserver.h
-vlprocs.o vlprocs.lo: vlserver.h
-vlserver.o vlserver.lo: vlserver.h
-vlutils.o vlutils.lo: vlserver.h
+volser.h: ${VOLSER}/volerr.et ${VOLSER}/volser.p.h
+	${COMPILE_ET_H} -p ${VOLSER} volerr -h volser
+
+common.o: volser.h
+dumpstuff.o: volser.h
+lockprocs.o: volser.h
+vol-dump.o.lo: volser.h
+volmain.o: volser.h
+volprocs.o: volser.h
+vol_split.o: volser.h
+voltrans.o: volser.h
+vos.o: volser.h
+vsprocs.o: volser.h
+vsutils.o: volser.h
 
 vldbint.cs.o: ../vlserver/vldbint.cs.c
 	$(AFS_CCRULE) -I$(VLSERVER) ../vlserver/vldbint.cs.c
@@ -195,6 +203,6 @@ dest: volserver
 clean:
 	$(LT_CLEAN)
 	$(RM) -f *.o vos volserver core AFS_component_version_number.c \
-		vl_errors.c vlserver.h
+		vl_errors.c volerr.c volser.h
 
 include ../config/Makefile.version
-- 
1.7.1