Makefile: fix libcephfs for gcov and cleanups

Adds EXTRALIBS, removes unused CFLAGS.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
Reviewed-by: Joe Buck <jbbuck@gmail.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index be851d69f55e83bdf6201d40fa3f93aa70c1d27e..2102e065b03faa4bceb520a1d4d7e17ea84a1e4e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -539,9 +539,9 @@ endif
 ##  - The Java source Makefile.am is in src/java
 if ENABLE_CEPHFS_JAVA
 libcephfs_jni_la_SOURCES = java/native/libcephfs_jni.cc
-libcephfs_jni_la_LIBADD = libcephfs.la
-libcephfs_jni_la_CFLAGS = $(JDK_CPPFLAGS) ${AM_CFLAGS} -I${srcdir}/include
-libcephfs_jni_la_CXXFLAGS = $(JDK_CPPFLAGS) ${AM_CXXFLAGS} -I${srcdir}/include
+libcephfs_jni_la_LIBADD = libcephfs.la $(EXTRALIBS)
+libcephfs_jni_la_CPPFLAGS = $(JDK_CPPFLAGS)
+libcephfs_jni_la_CXXFLAGS = ${AM_CXXFLAGS}
 libcephfs_jni_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
 lib_LTLIBRARIES += libcephfs_jni.la
 endif

diff --git a/src/java/native/libcephfs_jni.cc b/src/java/native/libcephfs_jni.cc
index c94e136a9808afdc6fb7a438620e51eb124930ac..09448b75ec4c2c2f235522a726d96376d31b97ed 100644 (file)
--- a/src/java/native/libcephfs_jni.cc
+++ b/src/java/native/libcephfs_jni.cc
@@ -25,7 +25,7 @@
 #include <fcntl.h>
 #include <jni.h>
 
-#include <cephfs/libcephfs.h>
+#include "include/cephfs/libcephfs.h"
 #include "common/dout.h"
 
 #define dout_subsys ceph_subsys_javaclient