Changeset 559

Timestamp:

Feb 9, 2015, 3:44:00 PM (10 years ago)

Author:

djay

Message:

Fix in autotools.

Location:

trunk/zoo-project/zoo-kernel

Files:

• Makefile.in (modified) (1 diff)
• configure.ac (modified) (1 diff)

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

@@ -48 +48 @@
         g++ ${XML2CFLAGS} ${OTBCFLAGS} ${CFLAGS} -c service_internal_otb.c
 
-otbRunner.o: otbRunner.cxx otbRunner.h service.h
-        g++ ${OTBCFLAGS} ${CFLAGS} -c otbRunner.cxx
-
 otbZooWatcher.o: otbZooWatcher.cxx otbZooWatcher.h  service.h
         g++ ${OTBCFLAGS} ${CFLAGS} -c otbZooWatcher.cxx

trunk/zoo-project/zoo-kernel/configure.ac

@@ -113 +113 @@
         OTB_LDFLAGS="-L$OTBPATH/lib/otb -lOTBIO -lOTBCommon -lOTBApplicationEngine -L$ITKPATH/lib -lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkdouble-conversion-$ITKVERS -litkv3p_lsqr-$ITKVERS -litkv3p_netlib-$ITKVERS -litkvcl-$ITKVERS -litkvnl-$ITKVERS -litkvnl_algo-$ITKVERS -litkzlib-$ITKVERS"
         OTB_CPPFLAGS="-I$OTBPATH/include/otb/ApplicationEngine -I$OTBPATH/include/otb/Common -I$ITKPATH/include/ITK-$ITKVERS -I$OTBPATH/include/otb/Utilities/ITK -I$OTBPATH/include/otb/ -I$OTBPATH/include/otb/IO -I$OTBPATH/include/otb/UtilitiesAdapters/OssimAdapters -I$OTBPATH/include/otb/UtilitiesAdapters/CurlAdapters -I$OTBPATH/include/otb/Utilities/BGL -I$OTBPATH/include/otb/UtilitiesAdapters/ITKPendingPatches -I$OTBPATH/include/otb/Utilities/otbconfigfile $GDAL_CFLAGS"
-        OTB_FILE="service_internal_otb.o" #otbZooWatcher.o otbRunner.o"
+        OTB_FILE="otbZooWatcher.o service_internal_otb.o"
         
         AC_LANG_PUSH([C++])