Build system: libkorder no longer depends on MatIO

kalman-mex
Sébastien Villemot 2023-07-26 14:30:35 +02:00
parent 9ff1d8556c
commit 33719e69f2
No known key found for this signature in database
GPG Key ID: 2CECE9350ECEBE4A
3 changed files with 5 additions and 7 deletions

View File

@ -3,10 +3,9 @@ mex_PROGRAMS = k_order_perturbation
TOPDIR = $(top_srcdir)/../../sources/k_order_perturbation
LIBKORDER_DIR = $(top_srcdir)/../../sources/libkorder
k_order_perturbation_CPPFLAGS = $(AM_CPPFLAGS) -I$(LIBKORDER_DIR) -I$(LIBKORDER_DIR)/kord -I$(LIBKORDER_DIR)/tl -I$(LIBKORDER_DIR)/utils -I$(LIBKORDER_DIR)/sylv -I$(LIBKORDER_DIR)/integ -I$(TOPDIR) $(CPPFLAGS_MATIO)
k_order_perturbation_CPPFLAGS = $(AM_CPPFLAGS) -I$(LIBKORDER_DIR) -I$(LIBKORDER_DIR)/kord -I$(LIBKORDER_DIR)/tl -I$(LIBKORDER_DIR)/utils -I$(LIBKORDER_DIR)/sylv -I$(LIBKORDER_DIR)/integ -I$(TOPDIR)
k_order_perturbation_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MATIO)
k_order_perturbation_LDADD = ../libkorder/libkorder.a $(LIBADD_DLOPEN) $(LIBADD_MATIO)
k_order_perturbation_LDADD = ../libkorder/libkorder.a $(LIBADD_DLOPEN)
nodist_k_order_perturbation_SOURCES = k_order_perturbation.cc

View File

@ -3,10 +3,9 @@ mex_PROGRAMS = k_order_welfare
TOPDIR = $(top_srcdir)/../../sources/k_order_welfare
LIBKORDER_DIR = $(top_srcdir)/../../sources/libkorder
k_order_welfare_CPPFLAGS = $(AM_CPPFLAGS) -I$(TOPDIR) -I$(LIBKORDER_DIR) -I$(LIBKORDER_DIR)/tl -I$(LIBKORDER_DIR)/kord -I$(LIBKORDER_DIR)/sylv -I$(LIBKORDER_DIR)/utils $(CPPFLAGS_MATIO)
k_order_welfare_CPPFLAGS = $(AM_CPPFLAGS) -I$(TOPDIR) -I$(LIBKORDER_DIR) -I$(LIBKORDER_DIR)/tl -I$(LIBKORDER_DIR)/kord -I$(LIBKORDER_DIR)/sylv -I$(LIBKORDER_DIR)/utils
k_order_welfare_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_MATIO)
k_order_welfare_LDADD = ../libkorder/libkorder.a $(LIBADD_DLOPEN) $(LIBADD_MATIO)
k_order_welfare_LDADD = ../libkorder/libkorder.a $(LIBADD_DLOPEN)
nodist_k_order_welfare_SOURCES = \
k_order_welfare.cc \

View File

@ -2,7 +2,7 @@ noinst_LIBRARIES = libkorder.a
TOPDIR = $(top_srcdir)/../../sources/libkorder
libkorder_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(TOPDIR) -I$(TOPDIR)/tl -I$(TOPDIR)/sylv -I$(TOPDIR)/kord -I$(TOPDIR)/utils $(CPPFLAGS_MATIO)
libkorder_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(TOPDIR) -I$(TOPDIR)/tl -I$(TOPDIR)/sylv -I$(TOPDIR)/kord -I$(TOPDIR)/utils
# TODO: fix the codebase so that the following line is no longer needed
libkorder_a_CXXFLAGS = $(AM_CXXFLAGS) -Wno-unused-parameter