Skip to content

Commit b6a121e

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents a0ebc11 + a0e038d commit b6a121e

3 files changed

Lines changed: 5 additions & 248 deletions

File tree

affinity/src/main/c/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ TARGET := $(TARGET_DIR)/libCEInternals.so
1010

1111
WORKING_DIR := $(TARGET_DIR)/../jni
1212

13-
JAVA_CLASSES = software.chronicle.enterprise.internals.impl.NativeAffinity \
14-
software.chronicle.enterprise.internals.hotspot.WBJvm
13+
JAVA_CLASSES = software.chronicle.enterprise.internals.impl.NativeAffinity
1514

1615
JNI_STUBS := $(subst .,_,$(JAVA_CLASSES))
1716
JNI_HEADERS := $(patsubst %,$(WORKING_DIR)/%.h,$(JNI_STUBS))
@@ -33,6 +32,8 @@ else
3332
JAVAH_CLASSPATH = $(JAVA_BUILD_DIR)
3433
endif
3534

35+
.PHONY : clean
36+
3637
all: $(TARGET)
3738

3839
$(TARGET): $(JNI_HEADERS) $(JNI_SOURCES)
@@ -42,3 +43,5 @@ $(JNI_HEADERS): $(JNI_JAVA_SOURCES)
4243
mkdir -p $(TARGET_DIR)/jni
4344
javah -force -classpath $(JAVAH_CLASSPATH) -d $(WORKING_DIR) $(JAVA_CLASSES)
4445

46+
clean:
47+
rm $(TARGET)

affinity/src/main/c/software_chronicle_enterprise_internals_hotspot_WBJvm.c

Lines changed: 0 additions & 150 deletions
This file was deleted.

affinity/src/main/java/software/chronicle/enterprise/internals/hotspot/WBJvm.java

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)