[hkl] 08/22: Imported Upstream version 4.99.99.1895
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Jan 30 15:22:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch experimental
in repository hkl.
commit b001175c3abe229ae273bbd49a1985509ede05c8
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Fri Jan 30 14:36:05 2015 +0100
Imported Upstream version 4.99.99.1895
---
ChangeLog | 30 ++++++++
Documentation/hkl.html | 10 +--
.../sphinx/source/pyplots/trajectory_full.py | 2 +
.../sphinx/source/pyplots/trajectory_simple.py | 2 +
configure | 22 +++---
gui/Makefile.am | 4 ++
gui/Makefile.in | 52 +++++++++++++-
hkl3d/Makefile.am | 2 +-
hkl3d/Makefile.in | 83 ++++------------------
tests/Makefile.am | 3 +
tests/Makefile.in | 54 ++++++++++++--
11 files changed, 171 insertions(+), 93 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index eb2fecd..d516908 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,35 @@
# Generated by Makefile. Do not edit.
+commit d2d8b3c78cb8356ba59da9f1f5d6a4b841915f69
+Author: Picca Frédéric-Emmanuel <picca at debian.org>
+Date: Fri Jan 30 14:32:44 2015 +0100
+
+ [buildsystem] force link with g++ when libhkl3d is involved.
+
+ gui/Makefile.am | 4 ++++
+ tests/Makefile.am | 3 +++
+ 2 files changed, 7 insertions(+)
+
+commit 75ff100c4a7997f667c57f88914917a419157d34
+Author: Picca Frédéric-Emmanuel <picca at debian.org>
+Date: Fri Jan 30 13:55:54 2015 +0100
+
+ [hkl3d] do not install the libhkl3d library for now
+
+ hkl3d/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit af635b1ebdbb04172579035e4974ee499d14bb89
+Author: Picca Frédéric-Emmanuel <picca at debian.org>
+Date: Fri Jan 30 12:15:22 2015 +0100
+
+ [tests] fix the tests when no X is available.
+
+ Documentation/sphinx/source/pyplots/trajectory.py | 2 ++
+ Documentation/sphinx/source/pyplots/trajectory_full.py | 2 ++
+ Documentation/sphinx/source/pyplots/trajectory_simple.py | 2 ++
+ 3 files changed, 6 insertions(+)
+
commit 2b2531c8d01eea14abb3e3912731fc927eba5128
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Sun Jan 25 20:16:07 2015 +0100
diff --git a/Documentation/hkl.html b/Documentation/hkl.html
index bb2750a..8075df6 100644
--- a/Documentation/hkl.html
+++ b/Documentation/hkl.html
@@ -3,8 +3,8 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
-<title>Welcome to hkl's 4.99.99.1892 documentation!</title>
-<!-- 2015-01-30 ven. 09:17 -->
+<title>Welcome to hkl's 4.99.99.1895 documentation!</title>
+<!-- 2015-01-30 ven. 14:33 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="generator" content="Org-mode" />
<meta name="author" content="Picca Frédéric-Emmanuel" />
@@ -179,7 +179,7 @@ for the JavaScript code in this tag.
</head>
<body>
<div id="content">
-<h1 class="title">Welcome to hkl's 4.99.99.1892 documentation!</h1>
+<h1 class="title">Welcome to hkl's 4.99.99.1895 documentation!</h1>
<div id="table-of-contents">
<h2>Table of Contents</h2>
<div id="text-table-of-contents">
@@ -3797,7 +3797,7 @@ You can find the bug tracker here
<li>Other OS
<p>
-You just need to send an <a href="mailto:submit at bugs.debian.org?subject=%20My%20problem%20with%20hkl...&body=Package:%20hkl%0AVersion:%204.99.99.1892%0A%0AI%20found%20this%20problem%20in%20hkl">email</a>
+You just need to send an <a href="mailto:submit at bugs.debian.org?subject=%20My%20problem%20with%20hkl...&body=Package:%20hkl%0AVersion:%204.99.99.1895%0A%0AI%20found%20this%20problem%20in%20hkl">email</a>
</p>
</li>
</ul>
@@ -4513,7 +4513,7 @@ pseudo axes and the mode parameters.
</div></div>
<div id="postamble" class="status">
<p class="author">Author: Picca Frédéric-Emmanuel</p>
-<p class="date">Created: 2015-01-30 ven. 09:17</p>
+<p class="date">Created: 2015-01-30 ven. 14:33</p>
<p class="creator"><a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.4.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10)</p>
<p class="validation"><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
</div>
diff --git a/Documentation/sphinx/source/pyplots/trajectory_full.py b/Documentation/sphinx/source/pyplots/trajectory_full.py
index b8827a4..367151d 100755
--- a/Documentation/sphinx/source/pyplots/trajectory_full.py
+++ b/Documentation/sphinx/source/pyplots/trajectory_full.py
@@ -4,6 +4,8 @@
import math
import numpy
+import matplotlib
+matplotlib.use('Agg')
import matplotlib.pyplot as plt
from gi.repository import GLib
diff --git a/Documentation/sphinx/source/pyplots/trajectory_simple.py b/Documentation/sphinx/source/pyplots/trajectory_simple.py
index 21e1e2d..2d3e8be 100755
--- a/Documentation/sphinx/source/pyplots/trajectory_simple.py
+++ b/Documentation/sphinx/source/pyplots/trajectory_simple.py
@@ -4,6 +4,8 @@
import math
import numpy
+import matplotlib
+matplotlib.use('Agg')
import matplotlib.pyplot as plt
from gi.repository import GLib
diff --git a/configure b/configure
index 2190348..3d78639 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for hkl 4.99.99.1892.
+# Generated by GNU Autoconf 2.69 for hkl 4.99.99.1895.
#
# Report bugs to <picca at synchrotron-soleil.fr>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='hkl'
PACKAGE_TARNAME='hkl'
-PACKAGE_VERSION='4.99.99.1892'
-PACKAGE_STRING='hkl 4.99.99.1892'
+PACKAGE_VERSION='4.99.99.1895'
+PACKAGE_STRING='hkl 4.99.99.1895'
PACKAGE_BUGREPORT='picca at synchrotron-soleil.fr'
PACKAGE_URL=''
@@ -1424,7 +1424,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures hkl 4.99.99.1892 to adapt to many kinds of systems.
+\`configure' configures hkl 4.99.99.1895 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1494,7 +1494,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of hkl 4.99.99.1892:";;
+ short | recursive ) echo "Configuration of hkl 4.99.99.1895:";;
esac
cat <<\_ACEOF
@@ -1643,7 +1643,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-hkl configure 4.99.99.1892
+hkl configure 4.99.99.1895
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2317,7 +2317,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by hkl $as_me 4.99.99.1892, which was
+It was created by hkl $as_me 4.99.99.1895, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3185,7 +3185,7 @@ fi
# Define the identity of the package.
PACKAGE='hkl'
- VERSION='4.99.99.1892'
+ VERSION='4.99.99.1895'
cat >>confdefs.h <<_ACEOF
@@ -15929,7 +15929,7 @@ _ACEOF
cat >>confdefs.h <<_ACEOF
-#define VREV 1892
+#define VREV 1895
_ACEOF
version_info="103:99:99"
@@ -19406,7 +19406,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by hkl $as_me 4.99.99.1892, which was
+This file was extended by hkl $as_me 4.99.99.1895, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19472,7 +19472,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-hkl config.status 4.99.99.1892
+hkl config.status 4.99.99.1895
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/gui/Makefile.am b/gui/Makefile.am
index a16305f..6eef3e7 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -31,6 +31,7 @@ appldir = ${datadir}/applications
dist_appl_DATA = ghkl.desktop
if HKL3D
+
AM_CFLAGS += \
-I$(top_srcdir)/hkl3d \
-I$(top_srcdir)/hkl3d/bullet/src \
@@ -44,6 +45,9 @@ AM_LDFLAGS += -lstdc++\
$(GTKGLEXT_LIBS) \
$(BULLET_LIBS)
+# force linkage using g++ for libhkl3d.la
+nodist_EXTRA_ghkl_SOURCES = dummy.cxx
+
ghkl_LDADD += \
$(top_builddir)/hkl3d/libhkl3d.la
diff --git a/gui/Makefile.in b/gui/Makefile.in
index 4944995..ad415e6 100644
--- a/gui/Makefile.in
+++ b/gui/Makefile.in
@@ -168,7 +168,25 @@ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(ghkl_SOURCES)
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_ at AM_V@)
+am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+am__v_CXX_0 = @echo " CXX " $@;
+am__v_CXX_1 =
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo " CXXLD " $@;
+am__v_CXXLD_1 =
+SOURCES = $(ghkl_SOURCES) $(nodist_EXTRA_ghkl_SOURCES)
DIST_SOURCES = $(am__ghkl_SOURCES_DIST)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
@@ -404,10 +422,13 @@ ghkl_SOURCES = hkl-gui-macros.h hkl-gui-pseudoaxes.c \
dist_pkgdata_DATA = ghkl.ui pseudo.ui $(am__append_5)
appldir = ${datadir}/applications
dist_appl_DATA = ghkl.desktop
+
+# force linkage using g++ for libhkl3d.la
+ at HKL3D_TRUE@nodist_EXTRA_ghkl_SOURCES = dummy.cxx
all: all-am
.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .cxx .lo .o .obj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -490,7 +511,7 @@ clean-binPROGRAMS:
ghkl$(EXEEXT): $(ghkl_OBJECTS) $(ghkl_DEPENDENCIES) $(EXTRA_ghkl_DEPENDENCIES)
@rm -f ghkl$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(ghkl_OBJECTS) $(ghkl_LDADD) $(LIBS)
+ $(AM_V_CXXLD)$(CXXLINK) $(ghkl_OBJECTS) $(ghkl_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -498,6 +519,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dummy.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hkl-gui-3d-gl.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hkl-gui-3d.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hkl-gui-pseudoaxes.Po at am__quote@
@@ -527,6 +549,30 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+.cxx.o:
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cxx.obj:
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cxx.lo:
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
mostlyclean-libtool:
-rm -f *.lo
diff --git a/hkl3d/Makefile.am b/hkl3d/Makefile.am
index 4f577bb..acf434a 100644
--- a/hkl3d/Makefile.am
+++ b/hkl3d/Makefile.am
@@ -16,7 +16,7 @@ AM_LDFLAGS = -version-info 0:0:0 \
$(YAML_LIBS) \
$(BULLET_LIBS)
-lib_LTLIBRARIES = libhkl3d.la
+noinst_LTLIBRARIES = libhkl3d.la
libhkl3d_la_SOURCES = hkl3d.cpp
libhkl3d_la_LIBADD = \
$(top_builddir)/hkl/libhkl.la
diff --git a/hkl3d/Makefile.in b/hkl3d/Makefile.in
index 4eede81..6256a49 100644
--- a/hkl3d/Makefile.in
+++ b/hkl3d/Makefile.in
@@ -95,35 +95,7 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
+LTLIBRARIES = $(noinst_LTLIBRARIES)
libhkl3d_la_DEPENDENCIES = $(top_builddir)/hkl/libhkl.la
am_libhkl3d_la_OBJECTS = hkl3d.lo
libhkl3d_la_OBJECTS = $(am_libhkl3d_la_OBJECTS)
@@ -378,7 +350,7 @@ AM_LDFLAGS = -version-info 0:0:0 \
$(YAML_LIBS) \
$(BULLET_LIBS)
-lib_LTLIBRARIES = libhkl3d.la
+noinst_LTLIBRARIES = libhkl3d.la
libhkl3d_la_SOURCES = hkl3d.cpp
libhkl3d_la_LIBADD = \
$(top_builddir)/hkl/libhkl.la
@@ -419,33 +391,9 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
- }
-
-uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
- done
-
-clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; \
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; \
locs=`for p in $$list; do echo $$p; done | \
sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
sort -u`; \
@@ -455,7 +403,7 @@ clean-libLTLIBRARIES:
}
libhkl3d.la: $(libhkl3d_la_OBJECTS) $(libhkl3d_la_DEPENDENCIES) $(EXTRA_libhkl3d_la_DEPENDENCIES)
- $(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libhkl3d_la_OBJECTS) $(libhkl3d_la_LIBADD) $(LIBS)
+ $(AM_V_CXXLD)$(CXXLINK) $(libhkl3d_la_OBJECTS) $(libhkl3d_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -581,9 +529,6 @@ check-am: all-am
check: check-am
all-am: Makefile $(LTLIBRARIES) $(HEADERS)
installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -616,7 +561,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
mostlyclean-am
distclean: distclean-am
@@ -643,7 +588,7 @@ install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-libLTLIBRARIES
+install-exec-am:
install-html: install-html-am
@@ -683,23 +628,23 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-libLTLIBRARIES
+uninstall-am:
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+ clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
ctags-am distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
- install-info-am install-libLTLIBRARIES install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
+ tags tags-am uninstall uninstall-am
# Support for GNU Flymake, in Emacs.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 74703fe..a359ff9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -42,6 +42,9 @@ if HKL3D
all_tests += hkl3d-test-t
+# force linkage with g++
+nodist_EXTRA_hkl3d_test_t_SOURCES = dummy.cxx
+
AM_CPPFLAGS += -I$(top_srcdir)/hkl3d \
$(G3D_CFLAGS) \
$(BULLET_CFLAGS)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ddd6b82..7757730 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -295,6 +295,24 @@ AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_ at AM_V@)
+am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+am__v_CXX_0 = @echo " CXX " $@;
+am__v_CXX_1 =
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo " CXXLD " $@;
+am__v_CXXLD_1 =
SOURCES = hkl-axis-t.c hkl-bench-t.c hkl-detector-t.c hkl-geometry-t.c \
hkl-interval-t.c hkl-lattice-t.c hkl-matrix-t.c \
hkl-parameter-t.c hkl-pseudoaxis-e4ch-t.c \
@@ -302,8 +320,8 @@ SOURCES = hkl-axis-t.c hkl-bench-t.c hkl-detector-t.c hkl-geometry-t.c \
hkl-pseudoaxis-k4cv-t.c hkl-pseudoaxis-k6c-t.c \
hkl-pseudoaxis-soleil-sixs-med-t.c hkl-pseudoaxis-t.c \
hkl-pseudoaxis-zaxis-t.c hkl-quaternion-t.c hkl-sample-t.c \
- hkl-source-t.c hkl-unit-t.c hkl-vector-t.c hkl3d-test-t.c \
- runtests.c
+ hkl-source-t.c hkl-unit-t.c hkl-vector-t.c \
+ $(nodist_EXTRA_hkl3d_test_t_SOURCES) hkl3d-test-t.c runtests.c
DIST_SOURCES = hkl-axis-t.c hkl-bench-t.c hkl-detector-t.c \
hkl-geometry-t.c hkl-interval-t.c hkl-lattice-t.c \
hkl-matrix-t.c hkl-parameter-t.c hkl-pseudoaxis-e4ch-t.c \
@@ -563,10 +581,13 @@ AM_CPPFLAGS = -Wextra -D_BSD_SOURCE -I$(top_srcdir) \
LDADD = $(top_builddir)/hkl/libhkl.la \
$(top_builddir)/tests/tap/libtap.a $(GLIB_LIBS) $(GSL_LIBS) \
$(am__append_4)
+
+# force linkage with g++
+ at HKL3D_TRUE@nodist_EXTRA_hkl3d_test_t_SOURCES = dummy.cxx
all: all-recursive
.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .cxx .lo .o .obj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -693,7 +714,7 @@ hkl-vector-t$(EXEEXT): $(hkl_vector_t_OBJECTS) $(hkl_vector_t_DEPENDENCIES) $(EX
hkl3d-test-t$(EXEEXT): $(hkl3d_test_t_OBJECTS) $(hkl3d_test_t_DEPENDENCIES) $(EXTRA_hkl3d_test_t_DEPENDENCIES)
@rm -f hkl3d-test-t$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(hkl3d_test_t_OBJECTS) $(hkl3d_test_t_LDADD) $(LIBS)
+ $(AM_V_CXXLD)$(CXXLINK) $(hkl3d_test_t_OBJECTS) $(hkl3d_test_t_LDADD) $(LIBS)
runtests$(EXEEXT): $(runtests_OBJECTS) $(runtests_DEPENDENCIES) $(EXTRA_runtests_DEPENDENCIES)
@rm -f runtests$(EXEEXT)
@@ -705,6 +726,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dummy.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hkl-axis-t.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hkl-bench-t.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hkl-detector-t.Po at am__quote@
@@ -753,6 +775,30 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
+.cxx.o:
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cxx.obj:
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cxx.lo:
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
mostlyclean-libtool:
-rm -f *.lo
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hkl.git
More information about the debian-science-commits
mailing list