Changeset 301 for branches/branch-1.2/zoo-services/cgal

Timestamp:

Aug 5, 2011, 3:02:43 PM (13 years ago)

Author:

djay

Message:

Merge branch-1.2 r268:r296.

Location:

branches/branch-1.2

Files:

• . (modified) (1 prop)
• zoo-services/cgal/Makefile (modified) (1 diff)

branches/branch-1.2/zoo-services/cgal/Makefile

@@ -1 @@
-CFLAGS=-I../../zoo-kernel/ -I./ `xml2-config --cflags` `python-config --cflags` -DLINUX_FREE_ISSUE #-DDEBUG
+ZRPATH=../../..
+include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
+CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
 CC=gcc
 
 cgi-env/cgal_service.zo: service.c
-        g++ ${CFLAGS} -shared -fpic -o cgi-env/cgal_service.zo ./service.c -lgdal -lCGAL
+        g++ ${CFLAGS} -shared -fpic -o cgi-env/cgal_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -lCGAL
 
 clean:
-        rm -f cgi-env/*.zo *.o *.tab.c *.tab.h *.sr.c* service_loader lex.* *.lreg *.sibling
-        rm -rf service_loader.dSYM
+        rm -f cgi-env/*.zo