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 a91f51999cfdddd28124a86c8ad363fee2185d34
Author: Pieter <kempe...@gmail.com>
Date: Fri Nov 21 16:23:45 2014 +0000
libbase has no src files
---
src/apps/Makefile.am | 4 ++--
src/base/Makefile.am | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/apps/Makefile.am b/src/apps/Makefile.am
index 0e130df..a2a243a 100644
--- a/src/apps/Makefile.am
+++ b/src/apps/Makefile.am
@@ -1,6 +1,6 @@
AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/base $(GDAL_CFLAGS)
@AM_CXXFLAGS@
-AM_LDFLAGS = $(GSL_LIBS) $(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 = $(GSL_LIBS) $(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 = $(GSL_LIBS) $(GDAL_LDFLAGS)
$(top_builddir)/src/algorithms/libalgorithms.la
$(top_builddir)/src/imageclasses/libimageClasses.la
$(top_builddir)/src/fileclasses/libfileClasses.la @AM_LDFLAGS@
+LDADD = $(GSL_LIBS) $(GDAL_LDFLAGS)
$(top_builddir)/src/algorithms/libalgorithms.la
$(top_builddir)/src/imageclasses/libimageClasses.la
$(top_builddir)/src/fileclasses/libfileClasses.la
###############################################################################
# THE PROGRAMS TO BUILD
###############################################################################
diff --git a/src/base/Makefile.am b/src/base/Makefile.am
index d2228de..797920d 100644
--- a/src/base/Makefile.am
+++ b/src/base/Makefile.am
@@ -4,7 +4,7 @@
# the program to build (the names of the final binaries)
#do not want to install pktestoption
-noinst_PROGRAMS = pktestOption
+noinst_PROGRAMS = pktestOption
# additional include pathes necessary to compile the C++ library
AM_LDFLAGS = $(GDAL_LDFLAGS) @AM_LDFLAGS@
@@ -16,7 +16,7 @@ AM_CXXFLAGS = -I$(top_srcdir)/src $(GDAL_CFLAGS) @AM_CXXFLAGS@
###############################################################################
#noinst_LIBRARIES = libbase.a
-lib_LTLIBRARIES = libbase.la
+#lib_LTLIBRARIES = libbase.la
# where to install the headers on the system
libbase_ladir = $(includedir)/pktools/base
@@ -24,14 +24,14 @@ libbase_ladir = $(includedir)/pktools/base
## Instruct libtool to include ABI version information in the generated shared
## library file (.so). The library ABI version is defined in configure.ac, so
## that all version information is kept in one place.
-libbase_la_LDFLAGS = -version-info $(PKTOOLS_SO_VERSION) $(AM_LDFLAGS)
+#libbase_la_LDFLAGS = -version-info $(PKTOOLS_SO_VERSION) $(AM_LDFLAGS)
# the list of header files that belong to the library (to be installed later)
libbase_la_HEADERS = Vector2d.h IndexValue.h Optionpk.h PosValue.h
# the sources to add to the library and to add to the source distribution
###############################################################################
-libbase_la_SOURCES = $(libbase_la_HEADERS)
+#libbase_la_SOURCES = $(libbase_la_HEADERS)
# list of sources for the binaries
pktestOption_SOURCES = pktestOption.cc
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/pktools.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
