Don't build the GCTP bundled with the source and link with the system's -lgctp instead. We also remove references to the "testdrivers" directory, which is not distributed together with the source, causing autoreconf to fail. diff --git a/Makefile.in b/Makefile.in index d468af2..90428a7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -206,7 +206,7 @@ LIBGCTP = $(top_builddir)/gctp/src/libGctp.la @TESTDRIVERS_CONDITIONAL_TRUE@TESTDRIVERS = testdrivers @INSTALL_INCLUDE_CONDITIONAL_FALSE@INCLUDE = @INSTALL_INCLUDE_CONDITIONAL_TRUE@INCLUDE = include -SUBDIRS = gctp src $(INCLUDE) samples $(TESTDRIVERS) +SUBDIRS = src $(INCLUDE) samples $(TESTDRIVERS) all: all-recursive .SUFFIXES: diff --git a/include/Makefile.in b/include/Makefile.in index 9938b23..afb7f40 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -190,7 +190,7 @@ LIBGCTP = $(top_builddir)/gctp/src/libGctp.la # Boilerplate include # Headers to install -include_HEADERS = HE2_config.h HdfEosDef.h HDFEOSVersion.h cfortHdf.h ease.h +include_HEADERS = HdfEosDef.h HDFEOSVersion.h cfortHdf.h ease.h all: HE2_config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/samples/Makefile.in b/samples/Makefile.in index 9da6e28..6a6186c 100644 --- a/samples/Makefile.in +++ b/samples/Makefile.in @@ -108,7 +108,6 @@ AppendField_SOURCES = AppendField.c AppendField_OBJECTS = AppendField.$(OBJEXT) AppendField_LDADD = $(LDADD) am__DEPENDENCIES_1 = $(top_builddir)/src/libhdfeos.la -am__DEPENDENCIES_2 = $(top_builddir)/gctp/src/libGctp.la AppendField_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) DefineFields_SOURCES = DefineFields.c DefineFields_OBJECTS = DefineFields.$(OBJEXT) @@ -481,7 +480,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ LIBHDFEOS2 = $(top_builddir)/src/libhdfeos.la -LIBGCTP = $(top_builddir)/gctp/src/libGctp.la +LIBGCTP = # Boilerplate definitions file -- 2.10.0
path: root/build-aux/run-system-tests.scm
AgeCommit message (Expand)Author
2016-11-03tests: 'make check-system' prints the "build trace"....* build-aux/run-system-tests.scm (run-system-tests): Pass #:print-build-trace to 'set-build-options*'. Ludovic Courtès
2016-10-27tests: Use #:fallback? #t when building system tests....* build-aux/run-system-tests.scm (run-system-tests): Pass #:fallback? #t to 'set-build-options*'. Ludovic Courtès
2016-06-20build: 'make check-system' now honors $TESTS....* build-aux/run-system-tests.scm (run-system-tests)[tests]: Honor the 'TESTS' environment variable. Ludovic Courtès
2016-06-20tests: Add a mechanism to describe and discover system tests....* gnu/tests.scm (<system-test>): New record type. (write-system-test, test-modules, fold-system-tests) (all-system-tests): New procedures. * gnu/tests/base.scm (%test-basic-os): Turn into a <system-test>. * gnu/tests/install.scm (%test-installed-os): Likewise. * build-aux/run-system-tests.scm (%system-tests): Remove. (run-system-tests): Use 'all-system-tests'. Ludovic Courtès
2016-06-20tests: Add system installation test....* gnu/tests.scm (define-os-with-source): New macro. * gnu/tests/install.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * build-aux/run-system-tests.scm (%system-tests): Likewise. Ludovic Courtès
2016-05-04build: Add 'run-system-tests.scm'....This file was meant to be added as part of commit e9f693d06f94bd96488c3910dba6504f94a6b6f9. * build-aux/run-system-tests.scm: New file. * Makefile.am (EXTRA_DIST): Add it. Ludovic Courtès