From: Andrew Deason <adeason@sinenomine.net>
Date: Sun, 8 Jan 2012 16:31:39 +0000 (-0500)
Subject: Make libjafs buildable again
X-Git-Tag: upstream/1.8.0_pre1^2~2852
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=967d7201ee5c27db6d75d5efafcad9458e2b5167;p=packages%2Fo%2Fopenafs.git

Make libjafs buildable again

libjafs is surprisingly close to being buildable. Fix a few misc
things which have bitrotted over the years so it is possible to
actually build:

 - Add -I$SRC/config to the cflags, so we can include afsconfig.h

 - Remove references to the nonexistant rxkstats.o

 - Do not link with UAFS' AFS_component_version_number.o, since this
   gives us duplicate version number symbols

 - Include afs_vosAdmin.h in Group.c, to satisfy some missing symbols

Change-Id: Ie8da88872288073d080a58ed7fe8c8b52052488e
Reviewed-on: http://gerrit.openafs.org/6524
Reviewed-by: Steven Jenkins <steven@synaptian.com>
Tested-by: Steven Jenkins <steven@synaptian.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/JAVA/libjafs/Group.c b/src/JAVA/libjafs/Group.c
index 93b715c8f..bc89a03f3 100644
--- a/src/JAVA/libjafs/Group.c
+++ b/src/JAVA/libjafs/Group.c
@@ -22,6 +22,8 @@
 #include "Internal.h"
 #include "org_openafs_jafs_Group.h"
 
+#include <afs_vosAdmin.h>
+
 #include <stdio.h>
 #include <afs_ptsAdmin.h>
 #include <afs_AdminPtsErrors.h>
diff --git a/src/JAVA/libjafs/Makefile.in b/src/JAVA/libjafs/Makefile.in
index d67637eba..1a764db72 100644
--- a/src/JAVA/libjafs/Makefile.in
+++ b/src/JAVA/libjafs/Makefile.in
@@ -36,10 +36,10 @@ SHARED_FLAGS = -shared -Xlinker -Bsymbolic
 OBJECT_FLAGS = -fPIC -c
 
 ifeq "$(BUILD_TYPE)" "admin"
-	INC := -I${TOP_INCDIR} -I${TOP_INCDIR}/afs/ ${JNI_INC}
+	INC := -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR}/afs/ ${JNI_INC}
 	CFLAGS := ${INC} ${DBG} ${OPTMZ} -I${TOP_SRCDIR}/config ${MT_CFLAGS}
 else
-	INC := -I${TOP_SRCDIR}/libuafs -I${TOP_INCDIR} ${JNI_INC}
+	INC := -I${TOP_SRCDIR}/config -I${TOP_SRCDIR}/libuafs -I${TOP_INCDIR} ${JNI_INC}
 	CFLAGS := ${INC} ${DBG} ${OPTMZ} ${FSINCLUDES} -D_REENTRANT -DLIBJUAFS ${MT_CFLAGS}
 endif
 
@@ -94,9 +94,7 @@ LIBJAFS_OBJS +=\
 	${LIBJAFSADMDIR}Internal.o \
 	${LIBJAFSADMDIR}UserToken.o \
 	${LIBJAFSADMDIR}VersionInfo.o \
-	${TOP_SRCDIR}/libuafs/UAFS/AFS_component_version_number.o \
-	${TOP_SRCDIR}/libuafs/UAFS/xdr_int32.o \
-        ${TOP_SRCDIR}/util/rxkstats.o
+	${TOP_SRCDIR}/libuafs/UAFS/xdr_int32.o
 
 ifeq (${SYS_NAME}, ppc64_linux26)
 LIBJAFSADM_OBJS =\
@@ -123,7 +121,6 @@ LIBJAFSADM_OBJS +=\
 	${LIBJAFSADMDIR}Server.o \
 	${LIBJAFSADMDIR}User.o \
 	${LIBJAFSADMDIR}Version2.o \
-	${TOP_SRCDIR}/libuafs/UAFS/AFS_component_version_number.o \
 	${LIBJAFSADMDIR}Volume.o
 
 CORRELATING_SOURCE_FILES =\