Changeset 522 for trunk/zoo-project/zoo-services/ogr

Timestamp:

Oct 31, 2014, 6:00:05 PM (9 years ago)

Author:

david

Message:

• Add install target, and fix cflags

Location:

trunk/zoo-project/zoo-services/ogr

Files:

• base-vect-ops/Makefile (modified) (2 diffs)
• ogr2ogr/Makefile (modified) (1 diff)

trunk/zoo-project/zoo-services/ogr/base-vect-ops/Makefile

@@ -1 +1 @@
 ZRPATH=../../..
 include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
-CFLAGS=${ZOO_CFLAGS} ${JSCFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} `geos-config --cflags` -DLINUX_FREE_ISSUE #-DDEBUG
+CFLAGS=${ZOO_CFLAGS} ${JSCFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${GEOS_CFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
 
 ifneq ($(MS_FILE),)
@@ -10 +10 @@
 
 cgi-env/ogr_service.zo: service.c
-        g++ ${CFLAGS} -shared -fpic -o cgi-env/ogr_service.zo ./service.c ../../../zoo-kernel/service_internal.o ${JS_LDFLAGS} ${JSLDFLAGS} ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} `geos-config --libs` ${MS_FILES} -lfcgi  -lpthread
+        g++ ${CFLAGS} -shared -fpic -o cgi-env/ogr_service.zo ./service.c ../../../zoo-kernel/service_internal.o ${JS_LDFLAGS} ${JSLDFLAGS} ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} ${GEOS_LDFLAGS}  ${MS_FILES} -lfcgi  -lpthread
 
+install:
+        install -d ${CGI_DIR}/ogr/base-vect-ops
+        install cgi-env/* ${CGI_DIR}/ogr/base-vect-ops
 
 clean:

trunk/zoo-project/zoo-services/ogr/ogr2ogr/Makefile

@@ -1 @@
-GDAL_SRC=./gdal_src/
-
-include $(GDAL_SRC)GDALmake.opt
-
-CPPFLAGS        :=      $(GDAL_INCLUDE) -I$(GDAL_ROOT)/frmts $(CPPFLAGS)
-DEP_LIBS        =       $(EXE_DEP_LIBS) $(XTRAOBJ)
-BIN_LIST = cgi-env/ogr2ogr_service.zo
-
-default:        $(BIN_LIST)
-
-all: default
-
-lib-depend:
-        (cd $(GDAL_SRC)/gcore ; $(MAKE) )
-        (cd $(GDAL_SRC)/port ; $(MAKE) )
-
-CFLAGS=-DZOO_SERVICE -I../../../zoo-kernel/
-
-#cgi-env/ogr2ogr_service.zo: service.c
-#       g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/ogr2ogr_service.zo ./service.c -lgdal
+ZRPATH=../../..
+include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
+CFLAGS=-DZOO_SERVICE ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
+CC=gcc
 
 cgi-env/ogr2ogr_service.zo: service.c $(DEP_LIBS)
-        g++ $(CFLAGS) $(CPPFLAGS) -shared -fpic $< `gdal-config --libs` -o $@
+        g++ $(CFLAGS) $(CPPFLAGS) -shared -fpic $<  -o $@
+
+install:
+        install -d ${CGI_DIR}/ogr/ogr2ogr
+        install cgi-env/* ${CGI_DIR}/ogr/ogr2ogr
 
 clean: