Fix java linkage

This commit is contained in:
pancake 2014-03-18 00:15:10 +01:00
parent 53edf7c17d
commit f80d659912
2 changed files with 14 additions and 11 deletions

View File

@ -9,6 +9,7 @@ STATIC_OBJ+=${OBJ_JAVA}
ifeq ($(WITHNONPIC),1)
STATIC_OBJ+=${SHARED2_JAVA}
endif
SHARED_OBJ+=${SHARED_JAVA}
TARGET_JAVA=bin_java.${EXT_SO}

View File

@ -1,17 +1,19 @@
OBJ_JAVA=core_java.o
SHARED_JAVA+=../../shlr/java/code.o
SHARED_JAVA+=../../shlr/java/class.o
SHARED_JAVA+=../../shlr/java/ops.o
SHARED2_JAVA=$(addprefix ../,${SHARED_JAVA})
OBJ_JAVA+=${SHARED2_JAVA}
CORE_OBJ_JAVA=core_java.o
CORE_SHARED_JAVA=../../shlr/java/code.o
CORE_SHARED_JAVA+=../../shlr/java/class.o
CORE_SHARED_JAVA+=../../shlr/java/ops.o
CORE_SHARED2_JAVA=$(addprefix ../,${CORE_SHARED_JAVA})
#CORE_OBJ_JAVA+=${CORE_SHARED2_JAVA}
#SHARED2_JAVA=
STATIC_OBJ+=${OBJ_JAVA}
TARGET_JAVA=core_java.${EXT_SO}
STATIC_OBJ+=${CORE_OBJ_JAVA}
CORE_TARGET_JAVA=core_java.${EXT_SO}
ALL_TARGETS+=${TARGET_JAVA}
ALL_TARGETS+=${CORE_TARGET_JAVA}
${TARGET_JAVA}: ${OBJ_JAVA}
${CORE_TARGET_JAVA}: ${CORE_OBJ_JAVA}
${CC} $(call libname,core_java) ${CFLAGS} \
-o core_java.${EXT_SO} \
${OBJ_JAVA} ${SHARED2_JAVA}
${CORE_OBJ_JAVA} ${CORE_SHARED2_JAVA}