This is an automated email from the ASF dual-hosted git repository. kapil pushed a commit to branch 1.7.x in repository https://gitbox.apache.org/repos/asf/mesos.git
commit c01c3fd00c0693a79681e0e05c8d8b4e6b690ece Author: Kapil Arya <ka...@mesosphere.io> AuthorDate: Mon Sep 3 12:20:24 2018 -0400 Consolidated Java header targets using makefile patterns. Review: https://reviews.apache.org/r/68612 --- src/Makefile.am | 56 +++++++------------------------------------------------- 1 file changed, 7 insertions(+), 49 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 9486ad6..9e7cf25 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2000,55 +2000,13 @@ nodist_libjava_la_SOURCES = \ BUILT_SOURCES += $(nodist_libjava_la_SOURCES) -java/jni/org_apache_mesos_MesosSchedulerDriver.h: $(MESOS_JAR) - $(JAVA_HOME)/bin/javah -d java/jni \ - -classpath $(MESOS_JAR):@PROTOBUF_JAR@ \ - org.apache.mesos.MesosSchedulerDriver - -java/jni/org_apache_mesos_MesosExecutorDriver.h: $(MESOS_JAR) - $(JAVA_HOME)/bin/javah -d java/jni \ - -classpath $(MESOS_JAR):@PROTOBUF_JAR@ \ - org.apache.mesos.MesosExecutorDriver - -java/jni/org_apache_mesos_Log.h: $(MESOS_JAR) - $(JAVA_HOME)/bin/javah -d java/jni \ - -classpath $(MESOS_JAR):@PROTOBUF_JAR@ \ - org.apache.mesos.Log - -java/jni/org_apache_mesos_state_AbstractState.h: $(MESOS_JAR) - $(JAVA_HOME)/bin/javah -d java/jni \ - -classpath $(MESOS_JAR):@PROTOBUF_JAR@ \ - org.apache.mesos.state.AbstractState - -java/jni/org_apache_mesos_state_LevelDBState.h: $(MESOS_JAR) - $(JAVA_HOME)/bin/javah -d java/jni \ - -classpath $(MESOS_JAR):@PROTOBUF_JAR@ \ - org.apache.mesos.state.LevelDBState - -java/jni/org_apache_mesos_state_LogState.h: $(MESOS_JAR) - $(JAVA_HOME)/bin/javah -d java/jni \ - -classpath $(MESOS_JAR):@PROTOBUF_JAR@ \ - org.apache.mesos.state.LogState - -java/jni/org_apache_mesos_state_Variable.h: $(MESOS_JAR) - $(JAVA_HOME)/bin/javah -d java/jni \ - -classpath $(MESOS_JAR):@PROTOBUF_JAR@ \ - org.apache.mesos.state.Variable - -java/jni/org_apache_mesos_state_ZooKeeperState.h: $(MESOS_JAR) - $(JAVA_HOME)/bin/javah -d java/jni \ - -classpath $(MESOS_JAR):@PROTOBUF_JAR@ \ - org.apache.mesos.state.ZooKeeperState - -java/jni/org_apache_mesos_v1_scheduler_V1Mesos.h: $(MESOS_JAR) - $(JAVA_HOME)/bin/javah -d java/jni \ - -classpath $(MESOS_JAR):@PROTOBUF_JAR@ \ - org.apache.mesos.v1.scheduler.V1Mesos - -java/jni/org_apache_mesos_v1_scheduler_V0Mesos.h: $(MESOS_JAR) - $(JAVA_HOME)/bin/javah -d java/jni \ - -classpath $(MESOS_JAR):@PROTOBUF_JAR@ \ - org.apache.mesos.v1.scheduler.V0Mesos +# The automatic variable '$(*F)' captures the matching stem (whatever matches +# the '%') of the target (e.g., 'org_apache_mesos_Log'). We then substitute +# '_' with '.' to get the class name (e.g., org.apache.mesos.Log). +java/jni/%.h: $(MESOS_JAR) + $(JAVA_HOME)/bin/javah -d java/jni \ + -classpath $(MESOS_JAR):@PROTOBUF_JAR@ \ + $(subst _,.,$(*F)) $(EXAMPLES_JAR): $(EXAMPLES_SOURCE) @echo "Building examples.jar ..."