Changeset 303

Timestamp:

Aug 5, 2011, 7:44:53 PM (13 years ago)

Author:

djay

Message:

Updating the trunk tree to add zoo-project directory containing zoo-api, zoo-kernel and zoo-service subdirs. Add HISTORY.txt file. Thanks to Jeff McKenna? for poiting this.

Location:

trunk/zoo-project

Files:

• . (added)
• HISTORY.txt (added)
• zoo-api (moved) (moved from trunk/zoo-api)
• zoo-kernel (moved) (moved from trunk/zoo-kernel)
• zoo-kernel/Makefile.in (modified) (1 diff)
• zoo-kernel/ZOOMakefile.opts.in (modified) (1 diff)
• zoo-services (moved) (moved from trunk/zoo-services)

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

@@ -14 +14 @@
 MS_FILE=@MS_FILE@
 
-CFLAGS=${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}
+CFLAGS=${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}
 
 PHPCFLAGS=@PHP_CPPFLAGS@

trunk/zoo-project/zoo-kernel/ZOOMakefile.opts.in

@@ -22 +22 @@
 endif
 
-ZOO_CFLAGS=-I${ZRPATH}/thirds/cgic206/ -I${ZRPATH}/zoo-kernel/
+ZOO_CFLAGS=-I${ZRPATH}/../thirds/cgic206/ -I${ZRPATH}/zoo-kernel/
 ZOO_LDFLAGS=-lcrypto