Remove empty Makefile continuation lines

[openafs.git] / src / JAVA / libjafs / Makefile.in

diff --git a/src/JAVA/libjafs/Makefile.in b/src/JAVA/libjafs/Makefile.in
index f672277..1e90c84 100644 (file)
--- a/src/JAVA/libjafs/Makefile.in
+++ b/src/JAVA/libjafs/Makefile.in
@@ -13,7 +13,7 @@ TOP_SRCDIR=@TOP_SRCDIR@
 TOP_INCDIR=@TOP_INCDIR@
 TOP_LIBDIR=@TOP_LIBDIR@
 TOP_JLIBDIR=@TOP_SRCDIR@/JAVA/libjafs
-JNI_INC=${JAVA_HOME}/include
+JNI_INC=-I ${JAVA_HOME}/include -I `dirname ${JAVA_HOME}/include/*/jni_md.h`
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 datarootdir=@datarootdir@
@@ -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/ -I${JAVA_HOME}/include -I ${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} -I${JAVA_HOME}/include -I ${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
 
@@ -51,7 +51,7 @@ PACKAGEDIR = ${ROOTPACKAGEDIR}/${RELPACKAGEDIR}
 JAVADOCSDIR = javadocs/
 
 JAVAH = ${JAVA_HOME}/bin/javah -classpath ${ROOTPACKAGEDIR} -jni -d ${LIBJAFSADMDIR}
-JAVAC = ${JAVA_HOME}/bin/javac -classpath ${ROOTPACKAGEDIR}
+JAVAC = ${JAVA_HOME}/bin/javac -source 1.4 -classpath ${ROOTPACKAGEDIR}
 
 J_NATIVE_PREFIX = org.openafs.jafs.
 C_NATIVE_PREFIX = org_openafs_jafs_
@@ -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 =\
@@ -154,7 +151,7 @@ CLIENTADMINLIB = ${TOP_LIBDIR}/libclientadmin.a
 
 LIBJAFS_LIBS =\
        ${TOP_LIBDIR}/libjuafs.a \
-       ${TOP_LIBDIR}/libdes.a \
+       ${TOP_LIBDIR}/libafsutil.a \
        -lresolv \
        -lpthread
 
@@ -205,7 +202,7 @@ clean:
 setup: FORCE
        if [ ! -e ./h ]; then \
          ln -s /usr/include/sys h; \
-       fi; \
+       fi;
 
 ${TOP_JLIBDIR}:
        mkdir -p $@