Commit 299f7273 authored by Karl Wette's avatar Karl Wette

Common generation of include header links

- Header links are now generated during "make dist", since
  they made be needed by generated distribution sources
Original: cc77df3a1e7f81699c2f99656edaa305d64bbaa4
parent 3eda8b3c
.PHONY: header-links
header-links: $(pkginclude_HEADERS) $(swiginclude_HEADERS)
$(AM_V_at)for dir in $(SUBDIRS); do \
if test "x$$dir" != "x."; then \
( cd "$$dir" && $(MAKE) $(AM_MAKEFLAGS) header-links ) || exit 1; \
fi; \
done; \
if test "x$<" != x; then \
echo "Making header-links in $(subdir)"; \
for file in $^; do \
targetfile="$(abs_builddir)/$$file"; \
linkname=`expr "$$targetfile" : '.*/\([^/]*\)$$'`; \
linkfile="$(abs_top_builddir)/include/lal/$$linkname"; \
if test ! -r "$$linkfile" ; then \
rm -f "$$linkfile"; \
$(LN_S) "$$targetfile" "$$linkfile"; \
fi; \
done; \
fi
include $(top_srcdir)/swig/swiglal_header.am
......@@ -37,12 +37,13 @@ include/config.h
include/config.h.in
include/lal/*.h
include/lal/*.i
include/lal/stamp-h2
include/lal/header-link-stamp
include/stamp-h1
lal-*.tar.gz
lal.spec
lib/lal/.vcsinfo
lib/lal/LALBuildInfo.c
lib/lal/LALConfig.h
lib/lal/LALVCSInfo.h
lib/lal/git_info.sed
lib/lal/git_version
......@@ -50,6 +51,7 @@ lib/lal/lal-user-env.csh
lib/lal/lal-user-env.sh
lib/lal/lal-user-env.shell
lib/lal/lal-version
lib/lal/stamp-h2
lib/lalsupport/test/*PrintVector.*
lib/lalsupport/test/?FS*.dat
lib/lalsupport/test/?TS*.dat
......
AC_PREREQ([2.63])
AC_INIT([LAL],[6.12.0.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([include/config.h include/lal/LALConfig.h])
AC_CONFIG_HEADERS([include/config.h lib/lal/LALConfig.h])
AC_CONFIG_SRCDIR([packages/std/include/LALStdio.h])
AC_CONFIG_AUX_DIR([gnuscripts])
AC_CONFIG_MACRO_DIR([gnuscripts])
......@@ -351,9 +351,6 @@ LALSUITE_ADD_GCC_FLAGS
# RedHat-derived systems.
AC_SUBST([pkgpythondir], ["\${pkgpyexecdir}"])
INCLUDEMKFILE=$srcdir/gnuscripts/include.mk
AC_SUBST_FILE([INCLUDEMKFILE])
# output
AC_OUTPUT
AC_MSG_NOTICE([
......
......@@ -5,7 +5,6 @@ EXTRA_DIST = \
config.sub \
cuda.common \
depcomp \
include.mk \
install-sh \
lal.m4 \
lalsuite_build.m4 \
......@@ -18,6 +17,3 @@ EXTRA_DIST = \
missing \
mkinstalldirs \
test-driver
all-local: include-link
@INCLUDEMKFILE@
## This file gets automatically appended to the end of the Makefile
include-link:
@for file in $(pkginclude_HEADERS) $(swiginclude_HEADERS) ; do \
sourcedir=$(abs_srcdir); \
targetdir=$(abs_top_builddir)/include/lal; \
if test ! -r $$targetdir/$$file ; then \
rm -f $$targetdir/$$file; \
$(LN_S) $$sourcedir/$$file $$targetdir; \
fi; \
done
@for file in LALVCSInfo.h ; do \
if [ -f $$file ]; then \
d=$(abs_builddir) ; \
targetdir=$(abs_top_builddir)/include/lal ; \
if test ! -r $$targetdir/$$file ; then \
rm -f $$targetdir/$$file; \
$(LN_S) $$d/$$file $$targetdir; \
fi; \
fi; \
done
../../gnuscripts/lallibs_header_links.am
\ No newline at end of file
## Process this file with automake to produce Makefile.in
pkginclude_HEADERS = LALConfig.h
EXTRA_DIST = LALConfig.h.in
DISTCLEANFILES = *.h *.i
all-local:
@for file in *.h *.i; do \
test -r $$file || rm -f $$file; \
done; \
set fnord $(MAKEFLAGS); amf=$$2; \
d=$(top_builddir)/packages; \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) include-links) \
|| case "$$amf" in *=*) exit1;; *k*) fail=yes;; *) exit 1;; esac; \
test -z "$$fail"
@d=$(top_builddir)/lib/lal; \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) include-link) \
|| case "$$amf" in *=*) exit1;; *k*) fail=yes;; *) exit 1;; esac; \
test -z "$$fail"
.PHONY: force-header-link-generation
EXTRA_DIST = header-link-stamp
BUILT_SOURCES = header-link-stamp
DISTCLEANFILES = header-link-stamp *.h *.i
include $(top_srcdir)/swig/swiglal_header.am
header-link-stamp: force-header-link-generation
$(AM_V_at)for file in $(DISTCLEANFILES); do \
test -r "$$file" || rm -f "$$file"; \
done; \
if test $(PACKAGE) = lal; then \
srcdirs="packages lib"; \
else \
srcdirs="src"; \
fi; \
for dir in $$srcdirs; do \
( cd "$(top_builddir)/$$dir" && $(MAKE) $(AM_MAKEFLAGS) header-links ) || exit 1; \
done; \
echo "$@" > $@
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
SUBDIRS = \
lal \
lalsupport
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
EXTRA_DIST = \
generate_user_env.awk
lib_LTLIBRARIES = liblal.la
pkginclude_HEADERS = \
LALLibVCSInfo.h \
LALBuildInfo.h \
LALConfig.h \
LALLibVCSInfo.h \
LALVCSInfo.h
liblal_la_SOURCES = \
......@@ -75,9 +78,3 @@ LALBuildInfo.c: Makefile $(liblal_la_DEPENDENCIES)
echo 'const char *const lalConfigureArgs = "'"$(ac_configure_args)"'";' >>$@; \
echo 'const char *const lalConfigureDate = "'"$(configure_date)"'";' >>$@; \
echo 'const char *const lalBuildDate = "'`date +"%Y-%m-%dT%H:%M:%S%z"`'";' >>$@
all-local: include-link
include-link: $(pkginclude_HEADERS)
@INCLUDEMKFILE@
include $(top_srcdir)/swig/swiglal_header.am
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
SUBDIRS = \
include \
src \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
EXTRA_DIST = \
support.dox \
LALMathematicaHplot1.eps \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
pkginclude_HEADERS = \
Audio.h \
FileIO.h \
......@@ -14,8 +16,3 @@ pkginclude_HEADERS = \
StreamOutput.h \
UserInput.h \
ConfigFile.h
all-local: include-link
@INCLUDEMKFILE@
include $(top_srcdir)/swig/swiglal_header.am
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include -DPKG_DATA_DIR='"$(pkgdatadir)/"' @AM_CPPFLAGS@
lib_LTLIBRARIES = liblalsupport.la
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include -DTEST_DATA_DIR='"$(abs_srcdir)/"' @AM_CPPFLAGS@
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
SUBDIRS = \
std \
tools \
......@@ -11,12 +13,3 @@ SUBDIRS = \
window \
fft \
noisemodels
include-links:
@set fnord $(MAKEFLAGS); amf=$$2; \
for d in $(SUBDIRS); do \
subdir=${top_builddir}/packages/$$d/include; \
echo "Making include-links in $$d/include"; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) include-link) \
|| case "$$amf" in *=*) exit1;; *k*) fail=yes;; *) exit 1;; esac; \
done; test -z "$$fail"
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
SUBDIRS = \
include \
src \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
EXTRA_DIST = date.dox
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
pkginclude_HEADERS = \
Date.h \
TimeDelay.h
all-local: include-link
@INCLUDEMKFILE@
include $(top_srcdir)/swig/swiglal_header.am
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
noinst_LTLIBRARIES = libdate.la
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include -I$(srcdir)/../src @AM_CPPFLAGS@
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
SUBDIRS = \
include \
src \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
EXTRA_DIST = factories.dox
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
pkginclude_HEADERS = \
AVFactories.h \
SeqFactories.h \
StringVector.h
all-local: include-link
@INCLUDEMKFILE@
include $(top_srcdir)/swig/swiglal_header.am
#include <string.h>
#include "LALStdlib.h"
#include "AVFactories.h"
#include "lal/LALStdlib.h"
#include "lal/AVFactories.h"
#define TYPECODE Z
#define TYPE COMPLEX16
......
#include "LALStdlib.h"
#include "AVFactories.h"
#include "SeqFactories.h"
#include "lal/LALStdlib.h"
#include "lal/AVFactories.h"
#include "lal/SeqFactories.h"
#define TYPECODE Z
#define TYPE COMPLEX16
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
noinst_LTLIBRARIES = libfactories.la
......
......@@ -4,8 +4,8 @@ File Name: VectorFactories.c
-------------------------------------------------------------------------*/
#include "LALStdlib.h"
#include "AVFactories.h"
#include "lal/LALStdlib.h"
#include "lal/AVFactories.h"
#define TYPECODE Z
#define TYPE COMPLEX16
......
#include "LALStdlib.h"
#include "SeqFactories.h"
#include "lal/LALStdlib.h"
#include "lal/SeqFactories.h"
#define TYPECODE Z
#define TYPE COMPLEX16
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
SUBDIRS = \
include \
src \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
EXTRA_DIST = fft.dox
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
if CUDA
CUDAHDRS = CudaPlan.h
endif
......@@ -8,8 +10,3 @@ pkginclude_HEADERS = \
FFTWMutex.h \
TimeFreqFFT.h \
$(CUDAHDRS)
all-local: include-link
@INCLUDEMKFILE@
include $(top_srcdir)/swig/swiglal_header.am
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
if QTHREAD
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
SUBDIRS = \
include \
src \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
EXTRA_DIST = \
inject.dox \
inject_binary.png \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
pkginclude_HEADERS = \
Inject.h \
SimulateCoherentGW.h \
SkyCoordinates.h
all-local: include-link
@INCLUDEMKFILE@
include $(top_srcdir)/swig/swiglal_header.am
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
noinst_LTLIBRARIES = libinject.la
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
SUBDIRS = \
include \
src \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
EXTRA_DIST = \
noisemodels.dox \
NoisePSDTest.pdf \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
pkginclude_HEADERS = \
LALNoiseModels.h
all-local: include-link
@INCLUDEMKFILE@
include $(top_srcdir)/swig/swiglal_header.am
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include @AM_CPPFLAGS@
noinst_LTLIBRARIES = libnoisemodels.la
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
SUBDIRS = \
include \
src \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
EXTRA_DIST = stats.dox
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
pkginclude_HEADERS = \
LALMoment.h \
LALCorrelation.h
all-local: include-link
@INCLUDEMKFILE@
include $(top_srcdir)/swig/swiglal_header.am
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
noinst_LTLIBRARIES = libstats.la
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
SUBDIRS = \
include \
src \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
EXTRA_DIST = std.dox
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
EXTRA_DIST = LALConfig.dox \
LALDatatypes.dox \
LALError.dox \
......@@ -26,11 +28,6 @@ pkginclude_HEADERS = \
lalswig_gsl.i \
lalswig_test.i
all-local: include-link
@INCLUDEMKFILE@
include $(top_srcdir)/swig/swiglal_header.am
swigincludedir = $(pkgincludedir)
swiginclude_HEADERS = \
SWIGLIGOTimeGPSPre.i \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
noinst_LTLIBRARIES = libstd.la
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
SUBDIRS = \
include \
src \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
EXTRA_DIST = \
tdfilter.dox \
tdfilter_iirfiltertest.eps \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
pkginclude_HEADERS = \
BandPassTimeSeries.h \
IIRFilter.h \
ZPGFilter.h
all-local: include-link
@INCLUDEMKFILE@
include $(top_srcdir)/swig/swiglal_header.am
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
noinst_LTLIBRARIES = libtdfilter.la
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
SUBDIRS = \
include \
src \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
EXTRA_DIST = \
tools.dox \
resamp_1000x4.eps \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
pkginclude_HEADERS = \
Calibration.h \
CoherentEstimation.h \
......@@ -16,8 +18,3 @@ pkginclude_HEADERS = \
TimeSeriesInterp.h \
TriggerInterpolation.h \
Units.h
all-local: include-link
@INCLUDEMKFILE@
include $(top_srcdir)/swig/swiglal_header.am
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
noinst_LTLIBRARIES = libtools.la
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include -DTEST_DATA_DIR='"$(abs_srcdir)/"' @AM_CPPFLAGS@
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
SUBDIRS = \
include \
src \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
EXTRA_DIST = \
utilities.dox \
utilitiesDirichletFig1.png \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
pkginclude_HEADERS = \
CoarseGrainFrequencySeries.h \
Dirichlet.h \
......@@ -13,8 +15,3 @@ pkginclude_HEADERS = \
RngMedBias.h \
Sort.h \
SphericalHarmonics.h
all-local: include-link
@INCLUDEMKFILE@
include $(top_srcdir)/swig/swiglal_header.am
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
noinst_LTLIBRARIES = libutilities.la
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
SUBDIRS = \
include \
src \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
EXTRA_DIST = vectorops.dox
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
pkginclude_HEADERS = \
VectorOps.h \
Matrix.h \
VectorIndexRange.h
all-local: include-link
@INCLUDEMKFILE@
include $(top_srcdir)/swig/swiglal_header.am
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@