Ignore:
Timestamp:
Jul 10, 2015, 2:39:24 PM (9 years ago)
Author:
djay
Message:

Merge trunk in branch-1.5 and created tag for the 1.5.0 release

Location:
branches/branch-1.5
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/branch-1.5

  • branches/branch-1.5/zoo-project/zoo-kernel/Makefile.in

    r673 r736  
    4040
    4141sqlapi.o: sqlapi.c sqlapi.h
    42         g++ -fPIC ${XML2CFLAGS} ${CFLAGS} ${JSCFLAGS} ${JS_ENABLED} -c sqlapi.c
     42        g++ -fPIC ${GDAL_CFLAGS} ${XML2CFLAGS} ${CFLAGS} ${JSCFLAGS} ${JS_ENABLED} -c sqlapi.c
    4343
    4444caching.o: caching.c
     
    112112         ln -s ${LIBZOO_SERVICE} libzoo_service.${EXT})
    113113        install -d ${DESTDIR}${INST_INCLUDE}/zoo
    114         install service.h service_internal.h ${DESTDIR}${INST_INCLUDE}/zoo
     114        install sqlapi.h service.h service_internal.h ${DESTDIR}${INST_INCLUDE}/zoo
    115115
    116116clean:
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png