Adjustments on Makefile and compile
Refs: #52673
diff --git a/Makefile b/Makefile
index c453178..8d086d2 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,12 @@
ARCH = $(ANDROID_ABI)
SRC=sflphone-android
-JAVA_SOURCES=$(SRC)/src/org/sflphone/*.java
-JNI_SOURCES=$(SRC)/jni/*.c $(SRC)/jni/*.h
-
+export SFLPHONE_SRC=$(PWD)/sflphone
+LIBSFLPHONEJNI_H=sflphone/daemon/src/sflphone.h
LIBSFLPHONEJNI=$(SRC)/obj/local/$(ARCH)/libsflphone.so
-LIBSFLPHONEJNI_H=$(SRC)/sflphone/daemon/src/sflphone.h
+
+JAVA_SOURCES=$(SRC)/src/org/sflphone/*.java
+JNI_SOURCES=$(SRC)/jni/*.cpp $(SRC)/jni/*.h
ifneq ($(V),)
ANT_OPTS += -v
@@ -40,23 +41,6 @@
./gen-env.sh $(SRC)
$(VERBOSE)cd $(SRC) && ant $(ANT_OPTS) $(ANT_TARGET)
-SFLPHONE_MODULES=`./find_modules.sh $(SFLPHONE_BUILD_DIR)`
-
-$(LIBSFLPHONEJNI_H):
- $(VERBOSE)if [ -z "$(SFLPHONE_BUILD_DIR)" ]; then echo "SFLPHONE_BUILD_DIR not defined" ; exit 1; fi
- $(GEN)modules="$(SFLPHONE_MODULES)" ; \
- if [ -z "$$modules" ]; then echo "No SFLPHONE modules found in $(SFLPHONE_BUILD_DIR)/modules"; exit 1; fi; \
- DEFINITION=""; \
- BUILTINS="const void *vlc_static_modules[] = {\n"; \
- for file in $$modules; do \
- name=`echo $$file | sed 's/.*\.libs\/lib//' | sed 's/_plugin\.a//'`; \
- DEFINITION=$$DEFINITION"int vlc_entry__$$name (int (*)(void *, void *, int, ...), void *);\n"; \
- BUILTINS="$$BUILTINS vlc_entry__$$name,\n"; \
- done; \
- BUILTINS="$$BUILTINS NULL\n};\n"; \
- printf "/* Autogenerated from the list of modules */\n $$DEFINITION\n $$BUILTINS\n" > $@
-
-
$(LIBSFLPHONEJNI): $(JNI_SOURCES) $(LIBSFLPHONEJNI_H)
@if [ -z "$(SFLPHONE_BUILD_DIR)" ]; then echo "SFLPHONE_BUILD_DIR not defined" ; exit 1; fi
@if [ -z "$(ANDROID_NDK)" ]; then echo "ANDROID_NDK not defined" ; exit 1; fi
@@ -65,9 +49,7 @@
@echo
$(VERBOSE)if [ -z "$(SFLPHONE_SRC_DIR)" ] ; then SFLPHONE_SRC_DIR=./vlc; fi ; \
if [ -z "$(SFLPHONE_CONTRIB)" ] ; then SFLPHONE_CONTRIB="$$SFLPHONE_SRC_DIR/contrib/$(TARGET_TUPLE)"; fi ; \
- vlc_modules="$(SFLPHONE_MODULES)" ; \
if [ `echo "$(SFLPHONE_BUILD_DIR)" | head -c 1` != "/" ] ; then \
- vlc_modules="`echo $$vlc_modules|sed \"s|$(SFLPHONE_BUILD_DIR)|../$(SFLPHONE_BUILD_DIR)|g\"`" ; \
SFLPHONE_BUILD_DIR="../$(SFLPHONE_BUILD_DIR)"; \
fi ; \
[ `echo "$$SFLPHONE_CONTRIB" | head -c 1` != "/" ] && SFLPHONE_CONTRIB="../$$SFLPHONE_CONTRIB"; \
@@ -76,7 +58,6 @@
SFLPHONE_SRC_DIR="$$SFLPHONE_SRC_DIR" \
SFLPHONE_CONTRIB="$$SFLPHONE_CONTRIB" \
SFLPHONE_BUILD_DIR="$$SFLPHONE_BUILD_DIR" \
- SFLPHONE_MODULES="$$vlc_modules" \
NDK_DEBUG=$(NDK_DEBUG) \
TARGET_CFLAGS="$$SFLPHONE_EXTRA_CFLAGS"
@@ -90,7 +71,7 @@
rm -rf $(SRC)/gen java-libs/*/gen java-libs/*/bin .sdk vlc-sdk/ vlc-sdk.7z
jniclean: lightclean
- rm -f $(LIBSFLPHONEJNI) $(LIBSFLPHONEJNI_H)
+ rm -f $(LIBSFLPHONEJNI)
distclean: clean jniclean