[pktools] 108/375: created separate directory lasclasses for liblasClasses
Bas Couwenberg
sebastic at xs4all.nl
Wed Dec 3 21:54:04 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch upstream-master
in repository pktools.
commit 48babce23c99f617d5ff09a1605546c1db4e36b0
Author: user <user at osgeolive.(none)>
Date: Tue May 14 23:26:10 2013 +0200
created separate directory lasclasses for liblasClasses
---
Makefile.am | 3 +-
configure.ac | 54 ++++++++++++------------
src/apps/Makefile.am | 5 +--
src/base/Makefile.am | 1 +
src/fileclasses/Makefile.am | 10 +----
src/{fileclasses => lasclasses}/FileReaderLas.cc | 0
src/{fileclasses => lasclasses}/FileReaderLas.h | 0
src/{fileclasses => lasclasses}/Makefile.am | 16 ++-----
8 files changed, 38 insertions(+), 51 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d3bf4bd..afa0ec6 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,5 +5,6 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src/base \
src/imageclasses \
src/algorithms \
- $(FILECLASSES_OPT) \
+ src/fileclasses \
+ $(LASCLASSES_OPT) \
src/apps
diff --git a/configure.ac b/configure.ac
index 4a575a9..631829f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_CONFIG_MACRO_DIR([m4])
AX_LIB_GDAL()
GDAL_FOUND="no"
if test ! -z "$GDAL_CFLAGS" -a ! -z "$GDAL_LDFLAGS"; then
- GDAL_FOUND="yes"
+GDAL_FOUND="yes"
fi
AC_MSG_WARN([$GDAL_VERSION])
AC_MSG_WARN([$GDAL_CFLAGS])
@@ -26,16 +26,16 @@ AC_CHECK_HEADERS([gdal.h])
dnl Default-disabled features
AC_ARG_ENABLE([fann],
- AS_HELP_STRING([--enable-fann], [Enable feature fann]))
+AS_HELP_STRING([--enable-fann], [Enable feature fann]))
AS_IF([test "x$enable_fann" = "xyes"], [
- PKG_CHECK_MODULES(FANN, fann >= 2.1.0, [HAVE_FANN=1], [HAVE_FANN=0])
- AM_CONDITIONAL([USE_FANN], [test "$HAVE_FANN" -eq 1])
- AC_MSG_WARN("USE_FANN=true")
- ], [
- AM_CONDITIONAL(USE_FANN, false)
- AC_MSG_WARN("USE_FANN=false")
- ])
+PKG_CHECK_MODULES(FANN, fann >= 2.1.0, [HAVE_FANN=1], [HAVE_FANN=0])
+AM_CONDITIONAL([USE_FANN], [test "$HAVE_FANN" -eq 1])
+AC_MSG_WARN("USE_FANN=true")
+], [
+AM_CONDITIONAL(USE_FANN, false)
+AC_MSG_WARN("USE_FANN=false")
+])
dnl AC_ARG_ENABLE([svm],
dnl AS_HELP_STRING([--enable-svm], [Enable feature svm]))
@@ -46,29 +46,29 @@ dnl AC_MSG_WARN("USE_SVM=true")
dnl ])
AC_ARG_ENABLE([las],
- AS_HELP_STRING([--enable-las], [Enable feature las]))
+AS_HELP_STRING([--enable-las], [Enable feature las]))
AS_IF([test "x$enable_las" = "xyes"], [
- AM_CONDITIONAL(USE_LAS, true)
- AC_MSG_WARN("USE_LAS=true")
- FILECLASSES_OPT="src/fileclasses"
- AC_SUBST([FILECLASSES_OPT])
- ], [
- AM_CONDITIONAL(USE_LAS, false)
- AC_MSG_WARN("USE_LAS=false")
- ])
+AM_CONDITIONAL(USE_LAS, true)
+AC_MSG_WARN("USE_LAS=true")
+LASCLASSES_OPT="src/lasclasses"
+AC_SUBST([LASCLASSES_OPT])
+], [
+AM_CONDITIONAL(USE_LAS, false)
+AC_MSG_WARN("USE_LAS=false")
+])
AC_ARG_ENABLE([nlopt],
- AS_HELP_STRING([--enable-nlopt], [Enable feature nlopt]))
+AS_HELP_STRING([--enable-nlopt], [Enable feature nlopt]))
AS_IF([test "x$enable_nlopt" = "xyes"], [
- PKG_CHECK_MODULES(NLOPT, nlopt >= 2.1.0, [HAVE_NLOPT=1], [HAVE_NLOPT=0])
- AM_CONDITIONAL([USE_NLOPT], [test "$HAVE_NLOPT" -eq 1])
- AC_MSG_WARN("USE_NLOPT=true")
- ], [
- AM_CONDITIONAL(USE_NLOPT, false)
- AC_MSG_WARN("USE_NLOPT=false")
- ])
+PKG_CHECK_MODULES(NLOPT, nlopt >= 2.1.0, [HAVE_NLOPT=1], [HAVE_NLOPT=0])
+AM_CONDITIONAL([USE_NLOPT], [test "$HAVE_NLOPT" -eq 1])
+AC_MSG_WARN("USE_NLOPT=true")
+], [
+AM_CONDITIONAL(USE_NLOPT, false)
+AC_MSG_WARN("USE_NLOPT=false")
+])
PKG_CHECK_MODULES(GSL, gsl >= 1.14, [HAVE_GSL=1], [HAVE_GSL=0])
@@ -101,6 +101,8 @@ src/imageclasses/Makefile
src/fileclasses/Makefile
src/apps/Makefile
])
+AM_COND_IF([USE_LAS],
+ [AC_CONFIG_FILES([src/lasclasses/Makefile])])
# generate the final Makefile etc.
AC_OUTPUT
diff --git a/src/apps/Makefile.am b/src/apps/Makefile.am
index 7dd7113..a55b751 100644
--- a/src/apps/Makefile.am
+++ b/src/apps/Makefile.am
@@ -1,7 +1,6 @@
AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/base $(GDAL_CFLAGS) @AM_CXXFLAGS@
AM_LDFLAGS = $(GDAL_LDFLAGS) $(top_builddir)/src/algorithms/libalgorithms.la $(top_builddir)/src/imageclasses/libimageClasses.la $(top_builddir)/src/fileclasses/libfileClasses.la $(top_builddir)/src/base/libbase.la @AM_LDFLAGS@
-#LDADD = $(GDAL_LDFLAGS) $(top_builddir)/src/algorithms/libalgorithms.la $(top_builddir)/src/models/libmodels.la $(top_builddir)/src/models/libprospect.la $(top_builddir)/src/imageclasses/libimageClasses.la
-LDADD = $(GDAL_LDFLAGS) $(top_builddir)/src/algorithms/libalgorithms.la $(top_builddir)/src/models/libmodels.la $(top_builddir)/src/imageclasses/libimageClasses.la $(top_builddir)/src/fileclasses/libfileClasses.la $(top_builddir)/src/base/libbase.la
+LDADD = $(GDAL_LDFLAGS) $(top_builddir)/src/algorithms/libalgorithms.la $(top_builddir)/src/imageclasses/libimageClasses.la $(top_builddir)/src/fileclasses/libfileClasses.la $(top_builddir)/src/base/libbase.la
###############################################################################
# THE PROGRAMS TO BUILD
###############################################################################
@@ -25,7 +24,7 @@ endif
if USE_LAS
bin_PROGRAMS += pklas2img
pklas2img_SOURCES = pklas2img.cc
-pklas2img_LDADD = -llas $(AM_LDFLAGS)
+pklas2img_LDADD = $(top_srcdir)/src/lasclasses/liblasClasses.la -llas $(AM_LDFLAGS)
endif
if USE_NLOPT
bin_PROGRAMS += pkopt_svm
diff --git a/src/base/Makefile.am b/src/base/Makefile.am
index 25c6dfa..8b3c698 100644
--- a/src/base/Makefile.am
+++ b/src/base/Makefile.am
@@ -24,6 +24,7 @@ libbase_la_HEADERS = $(top_srcdir)/config.h Vector2d.h IndexValue.h Optionpk.h P
# the sources to add to the library and to add to the source distribution
###############################################################################
+libbase_la_SOURCES = $(libbase_la_HEADERS)
# list of sources for the binaries
pktestOption_SOURCES = pktestOption.cc
diff --git a/src/fileclasses/Makefile.am b/src/fileclasses/Makefile.am
index fb93397..232603a 100644
--- a/src/fileclasses/Makefile.am
+++ b/src/fileclasses/Makefile.am
@@ -1,4 +1,4 @@
-AM_LDFLAGS = $(GDAL_LDFLAGS) @AM_LDFLAGS@ -llas
+AM_LDFLAGS = $(GDAL_LDFLAGS) @AM_LDFLAGS@
AM_CXXFLAGS = -I$(top_srcdir)/src $(GDAL_CFLAGS) @AM_CXXFLAGS@
###############################################################################
@@ -6,7 +6,6 @@ AM_CXXFLAGS = -I$(top_srcdir)/src $(GDAL_CFLAGS) @AM_CXXFLAGS@
###############################################################################
# the library names to build (note we are building static libs only)
-#noinst_LIBRARIES = libfileClasses.a
lib_LTLIBRARIES = libfileClasses.la
# where to install the headers on the system
@@ -18,11 +17,4 @@ libfileClasses_la_HEADERS = FileReaderAscii.h
# the sources to add to the library and to add to the source distribution
libfileClasses_la_SOURCES = $(libfileClasses_la_HEADERS) FileReaderAscii.cc
-if USE_LAS
-# the list of header files that belong to the library (to be installed later)
-libfileClasses_la_HEADERS += FileReaderLas.h
-# the sources to add to the library and to add to the source distribution
-libfileClasses_la_SOURCES += FileReaderLas.h FileReaderLas.cc
-endif
-
###############################################################################
diff --git a/src/fileclasses/FileReaderLas.cc b/src/lasclasses/FileReaderLas.cc
similarity index 100%
rename from src/fileclasses/FileReaderLas.cc
rename to src/lasclasses/FileReaderLas.cc
diff --git a/src/fileclasses/FileReaderLas.h b/src/lasclasses/FileReaderLas.h
similarity index 100%
rename from src/fileclasses/FileReaderLas.h
rename to src/lasclasses/FileReaderLas.h
diff --git a/src/fileclasses/Makefile.am b/src/lasclasses/Makefile.am
similarity index 55%
copy from src/fileclasses/Makefile.am
copy to src/lasclasses/Makefile.am
index fb93397..e97db8c 100644
--- a/src/fileclasses/Makefile.am
+++ b/src/lasclasses/Makefile.am
@@ -6,23 +6,15 @@ AM_CXXFLAGS = -I$(top_srcdir)/src $(GDAL_CFLAGS) @AM_CXXFLAGS@
###############################################################################
# the library names to build (note we are building static libs only)
-#noinst_LIBRARIES = libfileClasses.a
-lib_LTLIBRARIES = libfileClasses.la
+lib_LTLIBRARIES = liblasClasses.la
# where to install the headers on the system
-libfileClasses_ladir = $(includedir)/fileclasses
+liblasClasses_ladir = $(includedir)/lasclasses
# the list of header files that belong to the library (to be installed later)
-libfileClasses_la_HEADERS = FileReaderAscii.h
+liblasClasses_la_HEADERS = FileReaderLas.h
# the sources to add to the library and to add to the source distribution
-libfileClasses_la_SOURCES = $(libfileClasses_la_HEADERS) FileReaderAscii.cc
-
-if USE_LAS
-# the list of header files that belong to the library (to be installed later)
-libfileClasses_la_HEADERS += FileReaderLas.h
-# the sources to add to the library and to add to the source distribution
-libfileClasses_la_SOURCES += FileReaderLas.h FileReaderLas.cc
-endif
+liblasClasses_la_SOURCES = $(liblasClasses_la_HEADERS) FileReaderLas.cc
###############################################################################
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git
More information about the Pkg-grass-devel
mailing list