From cba5920011c02bf8328e3470725a70bc180f495b Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@fb.com>
Date: Tue, 7 Apr 2015 15:19:25 -0700
Subject: [PATCH] build: don't use a glob for java/rocksjni/*

Summary:
* src.mk (JNI_NATIVE_SOURCES): New variable, so we don't have to use
a glob in Makefile
* Makefile (JNI_NATIVE_SOURCES): Remove glob-using definition, now
that the explicit list of sources is in src.mk.

Test Plan:
  Run this:
    JAVA_HOME=/usr/local/jdk-7u67-64 PATH=$JAVA_HOME/bin:$PATH \
      make rocksdbjava

Reviewers: yhchiang

Reviewed By: yhchiang

Subscribers: dhruba

Differential Revision: https://reviews.facebook.net/D36633
---
 Makefile |  1 -
 src.mk   | 27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f5e786ecb..2bb2e2453 100644
--- a/Makefile
+++ b/Makefile
@@ -815,7 +815,6 @@ ldb: tools/ldb.o $(LIBOBJECTS)
 # Jni stuff
 # ---------------------------------------------------------------------------
 
-JNI_NATIVE_SOURCES = ./java/rocksjni/*.cc
 JAVA_INCLUDE = -I$(JAVA_HOME)/include/ -I$(JAVA_HOME)/include/linux
 ARCH := $(shell getconf LONG_BIT)
 ROCKSDBJNILIB = librocksdbjni-linux$(ARCH).so
diff --git a/src.mk b/src.mk
index 39c08b6e4..b8b45f6a5 100644
--- a/src.mk
+++ b/src.mk
@@ -223,6 +223,33 @@ TEST_BENCH_SOURCES =                                                    \
   util/thread_list_test.cc                                              \
   util/thread_local_test.cc
 
+JNI_NATIVE_SOURCES =                                          \
+  java/rocksjni/backupablejni.cc                              \
+  java/rocksjni/checkpoint.cc                                 \
+  java/rocksjni/columnfamilyhandle.cc                         \
+  java/rocksjni/comparator.cc                                 \
+  java/rocksjni/comparatorjnicallback.cc                      \
+  java/rocksjni/env.cc                                        \
+  java/rocksjni/filter.cc                                     \
+  java/rocksjni/iterator.cc                                   \
+  java/rocksjni/loggerjnicallback.cc                          \
+  java/rocksjni/memtablejni.cc                                \
+  java/rocksjni/merge_operator.cc                             \
+  java/rocksjni/options.cc                                    \
+  java/rocksjni/ratelimiterjni.cc                             \
+  java/rocksjni/restorejni.cc                                 \
+  java/rocksjni/rocksjni.cc                                   \
+  java/rocksjni/slice.cc                                      \
+  java/rocksjni/snapshot.cc                                   \
+  java/rocksjni/statistics.cc                                 \
+  java/rocksjni/table.cc                                      \
+  java/rocksjni/transaction_log.cc                            \
+  java/rocksjni/ttl.cc                                        \
+  java/rocksjni/write_batch.cc                                \
+  java/rocksjni/writebatchhandlerjnicallback.cc               \
+  java/rocksjni/write_batch_test.cc                           \
+  java/rocksjni/write_batch_with_index.cc
+
 # Currently, we do not generate dependencies for
 # java/rocksjni/write_batch_test.cc, because its dependent,
 # java/include/org_rocksdb_WriteBatch.h is generated.