Commit 3eda8b3c authored by Karl Wette's avatar Karl Wette

Set pkgincludedir to ${includedir}/lal during configuration

Original: e5b378d2c3f9725ab115f191d47e9a27a474ee07
parent 50440eb0
......@@ -16,5 +16,4 @@ all-local:
|| case "$$amf" in *=*) exit1;; *k*) fail=yes;; *) exit 1;; esac; \
test -z "$$fail"
swig_headers = $(pkginclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -80,5 +80,4 @@ all-local: include-link
include-link: $(pkginclude_HEADERS)
@INCLUDEMKFILE@
swig_headers = $(pkginclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -18,5 +18,4 @@ pkginclude_HEADERS = \
all-local: include-link
@INCLUDEMKFILE@
swig_headers = $(pkginclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -5,5 +5,4 @@ pkginclude_HEADERS = \
all-local: include-link
@INCLUDEMKFILE@
swig_headers = $(pkginclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -6,5 +6,4 @@ pkginclude_HEADERS = \
all-local: include-link
@INCLUDEMKFILE@
swig_headers = $(pkginclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -12,5 +12,4 @@ pkginclude_HEADERS = \
all-local: include-link
@INCLUDEMKFILE@
swig_headers = $(pkginclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -6,5 +6,4 @@ pkginclude_HEADERS = \
all-local: include-link
@INCLUDEMKFILE@
swig_headers = $(pkginclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -4,5 +4,4 @@ pkginclude_HEADERS = \
all-local: include-link
@INCLUDEMKFILE@
swig_headers = $(pkginclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -5,5 +5,4 @@ pkginclude_HEADERS = \
all-local: include-link
@INCLUDEMKFILE@
swig_headers = $(pkginclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -29,7 +29,6 @@ pkginclude_HEADERS = \
all-local: include-link
@INCLUDEMKFILE@
swig_headers = $(pkginclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
swigincludedir = $(pkgincludedir)
......
......@@ -6,5 +6,4 @@ pkginclude_HEADERS = \
all-local: include-link
@INCLUDEMKFILE@
swig_headers = $(pkginclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -20,5 +20,4 @@ pkginclude_HEADERS = \
all-local: include-link
@INCLUDEMKFILE@
swig_headers = $(pkginclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -17,5 +17,4 @@ pkginclude_HEADERS = \
all-local: include-link
@INCLUDEMKFILE@
swig_headers = $(pkginclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -6,5 +6,4 @@ pkginclude_HEADERS = \
all-local: include-link
@INCLUDEMKFILE@
swig_headers = $(pkginclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -3,5 +3,4 @@ pkginclude_HEADERS = Window.h
all-local: include-link
@INCLUDEMKFILE@
swig_headers = $(pkginclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -14,18 +14,18 @@ swig-iface-headers :
patt=`echo '^$(subdir):' | $(SED) 's|\.|\\.|g'`; \
match=`$(SED) -n "\\|$$patt|p" $(swig_iface_headers)`; \
if test "x$$match" = x; then \
echo '$(subdir): $(swig_headers)' >> $(swig_iface_headers); \
echo '$(subdir): $(pkginclude_HEADERS)' >> $(swig_iface_headers); \
modified=true; \
else \
patt=`echo '^$(subdir): $(swig_headers)$$' | $(SED) 's|\.|\\.|g'`; \
patt=`echo '^$(subdir): $(pkginclude_HEADERS)$$' | $(SED) 's|\.|\\.|g'`; \
match=`$(SED) -n "\\|$$patt|p" $(swig_iface_headers)`; \
if test "x$$match" = x; then \
$(SED) -i 's|^$(subdir):.*$$|$(subdir): $(swig_headers)|' $(swig_iface_headers); \
$(SED) -i 's|^$(subdir):.*$$|$(subdir): $(pkginclude_HEADERS)|' $(swig_iface_headers); \
modified=true; \
fi; \
fi; \
else \
echo '$(subdir): $(swig_headers)' > $(swig_iface_headers); \
echo '$(subdir): $(pkginclude_HEADERS)' > $(swig_iface_headers); \
modified=true; \
fi; \
if test "x$$modified" = xtrue; then \
......
......@@ -135,6 +135,9 @@ LALSUITE_USE_SWIG([XLAL LAL])
# add gcc specific flags
LALSUITE_ADD_GCC_FLAGS
# force headers to be installed in ${includedir}/lal, ignoring library name
AC_SUBST([pkgincludedir], ["\${includedir}/lal"])
# force all python modules into the exec dir to prevent mixed C and
# pure-python library code from being split across lib and lib64 on
# RedHat-derived systems.
......
all-local: header-links
header-links:
@for file in $(lalburstinclude_HEADERS) ; do \
@for file in $(pkginclude_HEADERS) ; do \
sourcedir=$(abs_srcdir); \
targetdir=$(abs_top_builddir)/include/lal; \
if test ! -r $$targetdir/$$file ; then \
......
AM_CPPFLAGS = -I$(top_builddir)/include -DPKG_DATA_DIR='"$(pkgdatadir)/"' @AM_CPPFLAGS@
lalburstincludedir = $(includedir)/lal
lalburstinclude_HEADERS = \
pkginclude_HEADERS = \
CLR.h \
EPSearch.h \
GenerateBurst.h \
......@@ -102,5 +100,4 @@ LALBurstBuildInfo.c: Makefile $(liblalburst_la_DEPENDENCIES)
@LAL_HEADER_LINK@
swig_headers = $(lalburstinclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -122,6 +122,9 @@ LALSUITE_USE_SWIG([XLAL LAL])
# add gcc specific flags
LALSUITE_ADD_GCC_FLAGS
# force headers to be installed in ${includedir}/lal, ignoring library name
AC_SUBST([pkgincludedir], ["\${includedir}/lal"])
# force all python modules into the exec dir to prevent mixed C and
# pure-python library code from being split across lib and lib64 on
# RedHat-derived systems.
......
all-local: header-links
header-links:
@for file in $(laldetcharinclude_HEADERS) ; do \
@for file in $(pkginclude_HEADERS) ; do \
sourcedir=$(abs_srcdir); \
targetdir=$(abs_top_builddir)/include/lal; \
if test ! -r $$targetdir/$$file ; then \
......
AM_CPPFLAGS = -I$(top_builddir)/include -DPKG_DATA_DIR='"$(pkgdatadir)/"' @AM_CPPFLAGS@
LDADD = liblaldetchar.la
laldetcharincludedir = $(includedir)/lal
laldetcharinclude_HEADERS = \
pkginclude_HEADERS = \
LALDetChar.h \
LALDetCharBuildInfo.h \
LALDetCharConfig.h \
......@@ -82,5 +81,4 @@ LALDetCharBuildInfo.c: Makefile $(liblaldetchar_la_DEPENDENCIES)
@LAL_HEADER_LINK@
swig_headers = $(laldetcharinclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -143,6 +143,9 @@ LALSUITE_USE_SWIG([XLAL LAL])
# add gcc specific flags
LALSUITE_ADD_GCC_FLAGS
# force headers to be installed in ${includedir}/lal, ignoring library name
AC_SUBST([pkgincludedir], ["\${includedir}/lal"])
# force all python modules into the exec dir to prevent mixed C and
# pure-python library code from being split across lib and lib64 on
# RedHat-derived systems.
......
all-local: header-links
header-links:
@for file in $(lalframeinclude_HEADERS) ; do \
@for file in $(pkginclude_HEADERS) ; do \
sourcedir=$(abs_srcdir) ; \
targetdir=$(abs_top_builddir)/include/lal ; \
if test ! -r $$targetdir/$$file ; then \
......
......@@ -38,8 +38,7 @@ lalfr_paste_SOURCES = paste.c utils.c utils.h
lalfr_stream_SOURCES = stream.c
lalfr_vis_SOURCES = vis.c
lalframeincludedir = $(includedir)/lal
lalframeinclude_HEADERS = \
pkginclude_HEADERS = \
Aggregation.h \
FrameCalibration.h \
LALFrStream.h \
......@@ -125,5 +124,4 @@ LALFrameBuildInfo.c: Makefile $(liblalframe_la_DEPENDENCIES)
@LAL_HEADER_LINK@
swig_headers = $(lalframeinclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -193,6 +193,9 @@ AS_IF(
# add gcc specific flags
LALSUITE_ADD_GCC_FLAGS
# force headers to be installed in ${includedir}/lal, ignoring library name
AC_SUBST([pkgincludedir], ["\${includedir}/lal"])
# force all python modules into the exec dir to prevent mixed C and
# pure-python library code from being split across lib and lib64 on
# RedHat-derived systems.
......
all-local: header-links
header-links:
@for file in $(lalinferenceinclude_HEADERS) ; do \
@for file in $(pkginclude_HEADERS) ; do \
sourcedir=$(abs_srcdir); \
targetdir=$(abs_top_builddir)/include/lal; \
if test ! -r $$targetdir/$$file ; then \
......
......@@ -10,8 +10,7 @@ BAYESTARHDR = bayestar_sky_map.h
BAYESTARSRC = bayestar_sky_map.c
endif
lalinferenceincludedir = $(includedir)/lal
lalinferenceinclude_HEADERS = \
pkginclude_HEADERS = \
LALInference.h \
LALInferenceBuildInfo.h \
LALInferenceConfig.h \
......@@ -102,5 +101,4 @@ LALInferenceBuildInfo.c: Makefile $(liblalinference_la_DEPENDENCIES)
@LAL_HEADER_LINK@
swig_headers = $(lalinferenceinclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -139,6 +139,9 @@ if test "${cuda}" = "true"; then
AC_DEFINE([LALINSPIRAL_CUDA_ENABLED],[1],[Define if using cuda library])
fi
# force headers to be installed in ${includedir}/lal, ignoring library name
AC_SUBST([pkgincludedir], ["\${includedir}/lal"])
# force all python modules into the exec dir to prevent mixed C and
# pure-python library code from being split across lib and lib64 on
# RedHat-derived systems.
......
all-local: header-links
header-links:
@for file in $(lalinspiralinclude_HEADERS) ; do \
@for file in $(pkginclude_HEADERS) ; do \
sourcedir=$(abs_srcdir); \
targetdir=$(abs_top_builddir)/include/lal; \
if test ! -r $$targetdir/$$file ; then \
......
AM_CPPFLAGS = -I$(top_builddir)/include -DPKG_DATA_DIR='"$(pkgdatadir)/"' @AM_CPPFLAGS@
lalinspiralincludedir = $(includedir)/lal
lalinspiralinclude_HEADERS = \
pkginclude_HEADERS = \
BBHPhenomCoeffs.h \
Chisq_CPU.h \
Chisq_GPU.h \
......@@ -291,5 +290,4 @@ LALInspiralBuildInfo.c: Makefile $(liblalinspiral_la_DEPENDENCIES)
# cuda build rules
include $(top_srcdir)/gnuscripts/cuda.common
swig_headers = $(lalinspiralinclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -106,6 +106,9 @@ LALSUITE_USE_SWIG([XLAL LAL])
# add gcc specific flags
LALSUITE_ADD_GCC_FLAGS
# force headers to be installed in ${includedir}/lal, ignoring library name
AC_SUBST([pkgincludedir], ["\${includedir}/lal"])
# force all python modules into the exec dir to prevent mixed C and
# pure-python library code from being split across lib and lib64 on
# RedHat-derived systems.
......
all-local: header-links
header-links:
@for file in $(lalmetaioinclude_HEADERS) ; do \
@for file in $(pkginclude_HEADERS) ; do \
sourcedir=$(abs_srcdir); \
targetdir=$(abs_top_builddir)/include/lal; \
if test ! -r $$targetdir/$$file ; then \
......
AM_CPPFLAGS = -I$(top_builddir)/include -DPKG_DATA_DIR='"$(pkgdatadir)/"' @AM_CPPFLAGS@
lalmetaioincludedir = $(includedir)/lal
lalmetaioinclude_HEADERS = \
pkginclude_HEADERS = \
LALMetaIOBuildInfo.h \
LALMetaIOConfig.h \
LALMetaIOLibVCSInfo.h \
......@@ -78,5 +77,4 @@ LALMetaIOBuildInfo.c: Makefile $(liblalmetaio_la_DEPENDENCIES)
@LAL_HEADER_LINK@
swig_headers = $(lalmetaioinclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -142,6 +142,9 @@ LALSUITE_USE_SWIG([XLAL LAL])
# add gcc specific flags
LALSUITE_ADD_GCC_FLAGS
# force headers to be installed in ${includedir}/lal, ignoring library name
AC_SUBST([pkgincludedir], ["\${includedir}/lal"])
# force all python modules into the exec dir to prevent mixed C and
# pure-python library code from being split across lib and lib64 on
# RedHat-derived systems.
......
all-local: header-links
header-links:
@for file in $(lalpulsarinclude_HEADERS) ; do \
@for file in $(pkginclude_HEADERS) ; do \
sourcedir=$(abs_srcdir); \
targetdir=$(abs_top_builddir)/include/lal; \
if test ! -r $$targetdir/$$file ; then \
......
......@@ -5,8 +5,7 @@ XMLHDR = LALXMLVOTableSerializersPulsar.h
XMLSRC = LALXMLVOTableSerializersPulsar.c
endif
lalpulsarincludedir = $(includedir)/lal
lalpulsarinclude_HEADERS = \
pkginclude_HEADERS = \
BinaryPulsarTiming.h \
ComplexAM.h \
ComputeFstat.h \
......@@ -205,5 +204,4 @@ LALPulsarBuildInfo.c: Makefile $(liblalpulsar_la_DEPENDENCIES)
@LAL_HEADER_LINK@
swig_headers = $(lalpulsarinclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -141,6 +141,9 @@ AM_CONDITIONAL([HAVE_OPENMP],[test "x$OPENMP_ENABLE_VAL" = "xENABLED"])
# add gcc specific flags
LALSUITE_ADD_GCC_FLAGS
# force headers to be installed in ${includedir}/lal, ignoring library name
AC_SUBST([pkgincludedir], ["\${includedir}/lal"])
# force all python modules into the exec dir to prevent mixed C and
# pure-python library code from being split across lib and lib64 on
# RedHat-derived systems.
......
all-local: header-links
header-links:
@for file in $(lalsimulationinclude_HEADERS) ; do \
@for file in $(pkginclude_HEADERS) ; do \
sourcedir=$(abs_srcdir); \
targetdir=$(abs_top_builddir)/include/lal; \
if test ! -r $$targetdir/$$file ; then \
......
......@@ -41,8 +41,7 @@ bin_PROGRAMS = \
lalsim-sgwb \
lalsim-unicorn
lalsimulationincludedir = $(includedir)/lal
lalsimulationinclude_HEADERS = \
pkginclude_HEADERS = \
LALSimBlackHoleRingdown.h \
LALSimBurst.h \
LALSimInspiralPrecess.h \
......@@ -202,5 +201,4 @@ LALSimulationBuildInfo.c: Makefile $(liblalsimulation_la_DEPENDENCIES)
@LAL_HEADER_LINK@
swig_headers = $(lalsimulationinclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -104,6 +104,9 @@ LALSUITE_USE_SWIG([XLAL LAL])
# add gcc specific flags
LALSUITE_ADD_GCC_FLAGS
# force headers to be installed in ${includedir}/lal, ignoring library name
AC_SUBST([pkgincludedir], ["\${includedir}/lal"])
# force all python modules into the exec dir to prevent mixed C and
# pure-python library code from being split across lib and lib64 on
# RedHat-derived systems.
......
all-local: header-links
header-links:
@for file in $(lalstochasticinclude_HEADERS) ; do \
@for file in $(pkginclude_HEADERS) ; do \
sourcedir=$(abs_srcdir); \
targetdir=$(abs_top_builddir)/include/lal; \
if test ! -r $$targetdir/$$file ; then \
......
AM_CPPFLAGS = -I$(top_builddir)/include -DPKG_DATA_DIR='"$(pkgdatadir)/"' @AM_CPPFLAGS@
lalstochasticincludedir = $(includedir)/lal
lalstochasticinclude_HEADERS = \
pkginclude_HEADERS = \
AstroOmega.h \
LALStochasticBuildInfo.h \
LALStochasticConfig.h \
......@@ -83,5 +82,4 @@ LALStochasticBuildInfo.c: Makefile $(liblalstochastic_la_DEPENDENCIES)
@LAL_HEADER_LINK@
swig_headers = $(lalstochasticinclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
......@@ -116,6 +116,9 @@ LALSUITE_USE_SWIG([XLAL LAL])
# add gcc specific flags
LALSUITE_ADD_GCC_FLAGS
# force headers to be installed in ${includedir}/lal, ignoring library name
AC_SUBST([pkgincludedir], ["\${includedir}/lal"])
# force all python modules into the exec dir to prevent mixed C and
# pure-python library code from being split across lib and lib64 on
# RedHat-derived systems.
......
all-local: header-links
header-links:
@for file in $(lalxmlinclude_HEADERS) ; do \
@for file in $(pkginclude_HEADERS) ; do \
sourcedir=$(abs_srcdir); \
targetdir=$(abs_top_builddir)/include/lal; \
if test ! -r $$targetdir/$$file ; then \
......
AM_CPPFLAGS = -I$(top_builddir)/include -DPKG_DATA_DIR='"$(pkgdatadir)/"' @AM_CPPFLAGS@
lalxmlincludedir = $(includedir)/lal
lalxmlinclude_HEADERS = \
pkginclude_HEADERS = \
LALXML.h \
LALXMLBuildInfo.h \
LALXMLConfig.h \
......@@ -72,5 +71,4 @@ LALXMLBuildInfo.c: Makefile $(liblalxml_la_DEPENDENCIES)
@LAL_HEADER_LINK@
swig_headers = $(lalxmlinclude_HEADERS)
include $(top_srcdir)/swig/swiglal_header.am
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment