Changeset 612 for trunk/zoo-project

Timestamp:

Mar 13, 2015, 9:51:23 AM (10 years ago)

Author:

djay

Message:

Fix issue for building the libZOO.so from the Java ZOO-API

File:

• trunk/zoo-project/zoo-api/java/Makefile (modified) (2 diffs)

trunk/zoo-project/zoo-api/java/Makefile

@@ -10 +10 @@
 
 ifeq ($(JS_ENABLED),-DUSE_JS)
-        JS_FILES=../../zoo-kernel/${JS_FILE}
+        JS_FILES=../../zoo-kernel/${JS_FILE},
 endif
 ifeq ($(MS_FILE),service_internal_ms.o)
-        MS_FILES=../../zoo-kernel/${MS_FILE}
+        MS_FILES=../../zoo-kernel/${MS_FILE},
 endif
+
+
 
 all: libZOO.${ext}
@@ -28 +30 @@
 
 libZOO.${ext}: zoo-api.o
-        gcc zoo-api.o -shared -o libZOO.${ext} -Wl ../../zoo-kernel/service_internal.o ${JAVA_FILES} ${MS_FILES} ${JS_FILES} ../../zoo-kernel/ulinet.o ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lcrypto ${MS_LDFLAGS} ${MACOS_LD_FLAGS} -lcurl -lfcgi ${MACOS_LD_NET_FLAGS}
+        gcc zoo-api.o -shared -o libZOO.${ext} -Wl,../../zoo-kernel/service_internal.o,${JAVA_FILES},${MS_FILES}${JS_FILES}../../zoo-kernel/ulinet.o ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lcrypto ${MS_LDFLAGS} ${MACOS_LD_FLAGS} -lcurl -lfcgi ${MACOS_LD_NET_FLAGS}
 
 clean: