Commit 66a92bad authored by Karl Wette's avatar Karl Wette
Browse files

Define extra CPPFLAGS in configure.ac instead of in each Makefile.am

Original: 7263e41573081ba945e8c57a6b77dc19954a9d4f
parent 8155b293
......@@ -347,6 +347,11 @@ AM_CONDITIONAL([QTHREAD],[test x$qthread = xtrue])
# add gcc specific flags --- must be done at end or tests will break!
LALSUITE_ADD_GCC_FLAGS
# add extra preprocessor flags
AM_CPPFLAGS="\$(TEST_CPPFLAGS) ${AM_CPPFLAGS}"
AM_CPPFLAGS="-DPKG_DATA_DIR='\"\$(pkgdatadir)/\"' ${AM_CPPFLAGS}"
AM_CPPFLAGS="-I\$(top_builddir)/include ${AM_CPPFLAGS}"
# 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.
......
......@@ -62,7 +62,7 @@
*
*/
#include "config.h"
#include <config.h>
#include <stdarg.h>
#include <stdlib.h>
......
......@@ -60,7 +60,7 @@
#define localtime_r(timep, result) memcpy((result), localtime(timep), sizeof(struct tm))
#endif
#include "LogPrintf.h"
#include <lal/LogPrintf.h>
/* output file for log messages, default to standard error */
#define LogOutputDefault stderr
......
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
liblalsupport_la_SOURCES = \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include -DTEST_DATA_DIR='"$(abs_srcdir)/"' @AM_CPPFLAGS@
TEST_CPPFLAGS = -DTEST_DATA_DIR='"$(abs_srcdir)/"'
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
$(top_builddir)/lib/lalsupport/src/liblalsupport.la
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
noinst_LTLIBRARIES = libdate.la
libdate_la_SOURCES = \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include -I$(srcdir)/../src @AM_CPPFLAGS@
TEST_CPPFLAGS = -DTEST_DATA_DIR='"$(abs_srcdir)/"'
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
$(top_builddir)/lib/lalsupport/src/liblalsupport.la
......
......@@ -24,7 +24,8 @@
#include <lal/LALStdlib.h>
#include <lal/Date.h>
#include <XLALLeapSeconds.h>
#include "../src/XLALLeapSeconds.h"
static int do_test(int gpssec, int tai_utc_before, int tai_utc_after)
......
#include <string.h>
#include "lal/LALStdlib.h"
#include "lal/AVFactories.h"
#include <lal/LALStdlib.h>
#include <lal/AVFactories.h>
#define TYPECODE Z
#define TYPE COMPLEX16
......
#include "lal/LALStdlib.h"
#include "lal/AVFactories.h"
#include "lal/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
libfactories_la_SOURCES = \
......
......@@ -4,8 +4,8 @@ File Name: VectorFactories.c
-------------------------------------------------------------------------*/
#include "lal/LALStdlib.h"
#include "lal/AVFactories.h"
#include <lal/LALStdlib.h>
#include <lal/AVFactories.h>
#define TYPECODE Z
#define TYPE COMPLEX16
......
#include "lal/LALStdlib.h"
#include "lal/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@
TEST_CPPFLAGS = -DTEST_DATA_DIR='"$(abs_srcdir)/"'
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
$(top_builddir)/lib/lalsupport/src/liblalsupport.la
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
if QTHREAD
QTHREADSRC = qthread.c
else
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
TEST_CPPFLAGS = -DTEST_DATA_DIR='"$(abs_srcdir)/"'
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
$(top_builddir)/lib/lalsupport/src/liblalsupport.la
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
noinst_LTLIBRARIES = libinject.la
libinject_la_SOURCES = \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
TEST_CPPFLAGS = -DTEST_DATA_DIR='"$(abs_srcdir)/"'
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
$(top_builddir)/lib/lalsupport/src/liblalsupport.la
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include @AM_CPPFLAGS@
noinst_LTLIBRARIES = libnoisemodels.la
libnoisemodels_la_SOURCES = \
......
include $(top_srcdir)/gnuscripts/lallibs_header_links.am
AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/../include @AM_CPPFLAGS@
TEST_CPPFLAGS = -DTEST_DATA_DIR='"$(abs_srcdir)/"'
LDADD = \
$(top_builddir)/lib/lal/liblal.la \
$(top_builddir)/lib/lalsupport/src/liblalsupport.la
......
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