Changeset 459 for trunk/zoo-project/zoo-kernel/Makefile.in

Timestamp:

Apr 1, 2014, 11:32:29 PM (9 years ago)

Author:

djay

Message:

Initial introduction of Value and Range in AllowedValues?, update zcfg documentation. Return valid Status code when returning ExceptionRepport?.

File:

• trunk/zoo-project/zoo-kernel/Makefile.in (modified) (6 diffs)

trunk/zoo-project/zoo-kernel/Makefile.in

@@ +1 @@
+include ZOOMakefile.opts
+
 OS:=$(shell uname -s)
 ifeq ($(OS),Darwin)
@@ -10 +12 @@
 JAVA_FILE=@JAVA_FILE@
 
-MS_CFLAGS=@MS_CFLAGS@
-MS_LDFLAGS=@MS_LIBS@
-MS_FILE=@MS_FILE@
-
 CFLAGS=-fpic ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
 LDFLAGS=-lcurl -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lfcgi -lcrypto ${MS_LDFLAGS} ${MACOS_LD_FLAGS}
@@ -22 +20 @@
 PHP_FILE=@PHP_FILE@
 
-
-PYTHONCFLAGS=@PYTHON_CPPFLAGS@
-PYTHONLDFLAGS=@PYTHON_LDFLAGS@
-PYTHON_ENABLED=@PYTHON_ENABLED@
-PYTHON_FILE=@PYTHON_FILE@
-
-JSCFLAGS=@JS_CPPFLAGS@
-JSLDFLAGS=@JS_LDFLAGS@
-JS_ENABLED=@JS_ENABLED@
-JS_FILE=@JS_FILE@
-
-XML2CFLAGS=@XML2_CPPFLAGS@
-XML2LDFLAGS=@XML2_LDFLAGS@
-
-GDAL_CFLAGS=@GDAL_CFLAGS@
-GDAL_LIBS=@GDAL_LIBS@
 
 PERLCFLAGS=@PERL_CPPFLAGS@
@@ -89 +71 @@
         gcc -c ${XML2CFLAGS} ${PERLCFLAGS} ${CFLAGS}  ${PERL_ENABLED} service_internal_perl.c
 
-
 service_internal_java.o: service_internal_java.c service.h
         gcc -c ${XML2CFLAGS} ${JAVACFLAGS} ${CFLAGS} ${JAVA_ENABLED} service_internal_java.c
@@ -96 +77 @@
         gcc ${XML2CFLAGS} ${JSCFLAGS} ${CFLAGS} ${JS_ENABLED} -c service_internal_js.c
 
+service_internal_ruby.o: service_internal_ruby.c service_internal_ruby.h
+        g++ ${XML2CFLAGS} ${RUBYCFLAGS} ${CFLAGS} ${JSCFLAGS} ${JS_ENABLED} -c service_internal_ruby.c
 
 service_loader.o: service_loader.c service.h
@@ -103 +86 @@
         g++ -g -O2 ${XML2CFLAGS} ${CFLAGS} ${PYTHONCFLAGS} ${JAVACFLAGS} ${JSCFLAGS} ${PERLCFLAGS} ${PHPCFLAGS} ${PYTHON_ENABLED} ${JS_ENABLED} ${PHP_ENABLED} ${PERL_ENABLED} ${JAVA_ENABLED} -c zoo_service_loader.c  -fno-common -DPIC -o zoo_service_loader.o
 
-zoo_loader.cgi: zoo_loader.c zoo_service_loader.o  ulinet.o service.h lex.sr.o service_conf.tab.o service_conf.y ulinet.o main_conf_read.tab.o lex.cr.o service_internal.o ${MS_FILE} ${PYTHON_FILE} ${PHP_FILE} ${JAVA_FILE} ${JS_FILE} ${PERL_FILE}
-        g++ -g -O2 ${JSCFLAGS} ${PHPCFLAGS}  ${PERLCFLAGS}   ${JAVACFLAGS} ${XML2CFLAGS} ${PYTHONCFLAGS} ${CFLAGS} -c zoo_loader.c  -fno-common -DPIC -o zoo_loader.o
+zoo_loader.cgi: zoo_loader.c zoo_service_loader.o  ulinet.o service.h lex.sr.o service_conf.tab.o service_conf.y ulinet.o main_conf_read.tab.o lex.cr.o service_internal.o ${MS_FILE} ${PYTHON_FILE} ${PHP_FILE} ${JAVA_FILE} ${JS_FILE} ${PERL_FILE} ${RUBY_FILE}
+        g++ -g -O2 ${JSCFLAGS} ${PHPCFLAGS}  ${PERLCFLAGS} ${RUBYCFLAGS}  ${JAVACFLAGS} ${XML2CFLAGS} ${PYTHONCFLAGS} ${CFLAGS} -c zoo_loader.c  -fno-common -DPIC -o zoo_loader.o
         g++  ${JSCFLAGS} ${GDAL_CFLAGS} ${XML2CFLAGS} ${PHPCFLAGS} ${PERLCFLAGS} ${JAVACFLAGS} ${PYTHONCFLAGS} ${CFLAGS} zoo_loader.o zoo_service_loader.o service_internal.o ${MS_FILE} ${PYTHON_FILE}  ${PERL_FILE} ${PHP_FILE}  ${JS_FILE} ${JAVA_FILE} ulinet.o lex.cr.o lex.sr.o service_conf.tab.o main_conf_read.tab.o -o zoo_loader.cgi ${LDFLAGS}