Changeset 650

Timestamp:

May 29, 2015, 1:33:40 PM (10 years ago)

Author:

djay

Message:

Link against the zoo_service shared library from C service makefile.

Location:

trunk/zoo-project/zoo-services

Files:

• arithmetics/Makefile (modified) (1 diff)
• cgal/Makefile (modified) (1 diff)
• gdal/contour/Makefile (modified) (1 diff)
• gdal/dem/Makefile (modified) (1 diff)
• gdal/grid/Makefile (modified) (1 diff)
• gdal/profile/Makefile (modified) (1 diff)
• gdal/translate/Makefile (modified) (1 diff)
• gdal/warp/Makefile (modified) (1 diff)
• ogr/base-vect-ops/Makefile (modified) (1 diff)
• ogr/ogr2ogr/Makefile (modified) (1 diff)

trunk/zoo-project/zoo-services/arithmetics/Makefile

@@ -3 +3 @@
 
 cgi-env/test_service.zo: test_service.c
-        g++ ${CFLAGS} -shared -fpic -o cgi-env/test_service.zo ./test_service.c
+        g++ ${CFLAGS} -shared -fpic -o cgi-env/test_service.zo ./test_service.c -lzoo_service
 
 clean:

trunk/zoo-project/zoo-services/cgal/Makefile

@@ -7 +7 @@
         g++ ${CFLAGS} -c ./delaunay.c
         g++ ${CFLAGS} -c ./voronoi.c
-        g++ ${CFLAGS} -shared -o cgi-env/cgal_service.zo ./delaunay.o ./voronoi.o ./cgal_service.o ${GDAL_LIBS} ${MACOS_LD_FLAGS} ${CGAL_LDFLAGS} -lCGAL -lgmp -lgdal
+        g++ ${CFLAGS} -shared -o cgi-env/cgal_service.zo ./delaunay.o ./voronoi.o ./cgal_service.o ${GDAL_LIBS} ${MACOS_LD_FLAGS} ${CGAL_LDFLAGS} -lCGAL -lgmp -lgdal -lzoo_service
 
 cgal_service.o: cgal_service.c cgal_service.h

trunk/zoo-project/zoo-services/gdal/contour/Makefile

@@ -5 +5 @@
 
 cgi-env/contour_service.zo: service.c
-        g++ ${CFLAGS} -shared -fpic -o cgi-env/contour_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS}
+        g++ ${CFLAGS} -shared -fpic -o cgi-env/contour_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -lzoo_service
 install:
         install -d ${CGI_DIR}/gdal/contour

trunk/zoo-project/zoo-services/gdal/dem/Makefile

@@ -5 +5 @@
 
 cgi-env/dem_service.zo: service.c
-        g++ ${CFLAGS} -shared -fpic -o cgi-env/dem_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS}
+        g++ ${CFLAGS} -shared -fpic -o cgi-env/dem_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -lzoo_service
 
 install:

trunk/zoo-project/zoo-services/gdal/grid/Makefile

@@ -5 +5 @@
 
 cgi-env/service.zo: service.c
-        g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/gdal_grid_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS}
+        g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/gdal_grid_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -lzoo_service
 
 install:

trunk/zoo-project/zoo-services/gdal/profile/Makefile

@@ -5 +5 @@
 
 cgi-env/profile_service.zo: service.c
-        g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/profile_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS}
+        g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/profile_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -lzoo_service
 
 install:

trunk/zoo-project/zoo-services/gdal/translate/Makefile

@@ -5 +5 @@
 
 cgi-env/translate_service.zo: service.c
-        g++ ${CFLAGS} -shared -fpic -o cgi-env/translate_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS}
+        g++ ${CFLAGS} -shared -fpic -o cgi-env/translate_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -lzoo_service
 
 install:

trunk/zoo-project/zoo-services/gdal/warp/Makefile

@@ -5 +5 @@
 
 cgi-env/warp_service.zo: service.c
-        g++ ${CFLAGS} -shared -fpic -o cgi-env/warp_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS}
-
+        g++ ${CFLAGS} -shared -fpic -o cgi-env/warp_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -lzoo_service
 
 install:

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

@@ -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_LDFLAGS}  ${MS_FILES} -lfcgi  -lpthread
+        g++ ${CFLAGS} -shared -fpic -o cgi-env/ogr_service.zo ./service.c ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} ${GEOS_LDFLAGS} -lfcgi  -lpthread -lzoo_service
 
 install:

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

@@ -5 +5 @@
 
 cgi-env/ogr2ogr_service.zo: service.c $(DEP_LIBS)
-        g++ $(CFLAGS) $(CPPFLAGS) -shared -fpic $<  -o $@
+        g++ $(CFLAGS) $(CPPFLAGS) -shared -fpic $<  -o $@ ${GDAL_LIBS} -lzoo_service
 
 install: