Use javac -h for C headers generation

Author: alamar

affinity/pom.xml

@@ -175,7 +175,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <compilerArgument>-Xlint:deprecation</compilerArgument>
+                    <compilerArgs>
+                        <arg>-h</arg>
+                        <arg>${project.build.directory}/jni</arg>
+                        <arg>-Xlint:deprecation</arg>
+                    </compilerArgs>
                     <source>1.8</source>
                     <target>1.8</target>
                     <encoding>UTF-8</encoding>

affinity/src/main/c/Makefile

@@ -13,15 +13,13 @@ WORKING_DIR := $(TARGET_DIR)/../jni
 JAVA_CLASSES = software.chronicle.enterprise.internals.impl.NativeAffinity net.openhft.ticker.impl.JNIClock
 
 JNI_STUBS := $(subst .,_,$(JAVA_CLASSES))
-JNI_HEADERS := $(patsubst %,$(WORKING_DIR)/%.h,$(JNI_STUBS))
 JNI_SOURCES := $(patsubst %,%.cpp,$(JNI_STUBS))
-JNI_JAVA_SOURCES := $(patsubst %,$(TARGET_DIR)/%.class,$(subst .,/,$(JAVA_CLASSES)))
 
 JAVA_BUILD_DIR := $(TARGET_DIR)
 
 JAVA_HOME ?= /usr/java/default
 JAVA_LIB := $(JAVA_HOME)/jre/lib
-JVM_SHARED_LIBS := -L$(JAVA_LIB)/amd64/server -L$(JAVA_LIB)/i386/server  -L$(JAVA_LIB)/amd64/jrockit/ -L$(JAVA_LIB)/i386/jrockit/ -L$(JAVA_LIB)/ppc64le/server -L$(JAVA_LIB)/ppc64le/jrockit/
+JVM_SHARED_LIBS := -L$(JAVA_LIB)/amd64/server -L$(JAVA_LIB)/i386/server  -L$(JAVA_LIB)/amd64/jrockit/ -L$(JAVA_LIB)/i386/jrockit/ -L$(JAVA_LIB)/ppc64le/server -L$(JAVA_LIB)/ppc64le/jrockit/ -L$(JAVA_HOME)/lib/server
 
 CXX=g++
 INCLUDES := -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/linux -I $(WORKING_DIR)
@@ -37,12 +35,8 @@ endif
 
 all: $(TARGET)
 
-$(TARGET): $(JNI_HEADERS) $(JNI_SOURCES)
+$(TARGET): $(JNI_SOURCES)
 	$(CXX) -O3 -Wall -shared -fPIC $(JVM_SHARED_LIBS) -ljvm -lrt $(INCLUDES) $(JNI_SOURCES) -o $(TARGET)
 
-$(JNI_HEADERS): $(JNI_JAVA_SOURCES)
-	mkdir -p $(TARGET_DIR)/jni
-	javah -force -classpath $(JAVAH_CLASSPATH) -d $(WORKING_DIR) $(JAVA_CLASSES)
-
 clean:
 	rm $(TARGET)