From 33719e69f28ffa0a92e55d408ee9b84bbe694344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org> Date: Wed, 26 Jul 2023 14:30:35 +0200 Subject: [PATCH] Build system: libkorder no longer depends on MatIO --- mex/build/k_order_perturbation.am | 5 ++--- mex/build/k_order_welfare.am | 5 ++--- mex/build/libkorder.am | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/mex/build/k_order_perturbation.am b/mex/build/k_order_perturbation.am index 7102bc77e0..c872333b5c 100644 --- a/mex/build/k_order_perturbation.am +++ b/mex/build/k_order_perturbation.am @@ -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 diff --git a/mex/build/k_order_welfare.am b/mex/build/k_order_welfare.am index 26f24226ab..8fdcdde6cf 100644 --- a/mex/build/k_order_welfare.am +++ b/mex/build/k_order_welfare.am @@ -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 \ diff --git a/mex/build/libkorder.am b/mex/build/libkorder.am index 6c7d573fc7..7f0ed700c7 100644 --- a/mex/build/libkorder.am +++ b/mex/build/libkorder.am @@ -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 -- GitLab