From aaeb489abc79c8e16653f39beaa57045db609339 Mon Sep 17 00:00:00 2001 From: Benjamin Spencer Date: Wed, 8 Apr 2020 16:19:51 -0600 Subject: [PATCH] Makefile changes to deal with neml_export.h ref #66 --- contrib/neml.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/neml.mk b/contrib/neml.mk index b3322ece..47094260 100644 --- a/contrib/neml.mk +++ b/contrib/neml.mk @@ -8,7 +8,7 @@ neml_srcfiles := $(shell find $(neml_DIR)/src -name "*.cxx" | grep -v _wra neml_objects += $(patsubst %.cxx,%.$(obj-suffix),$(neml_srcfiles)) neml_LIB := $(neml_DIR)/libneml-$(METHOD).la neml_includes := $(neml_DIR)/src -neml_dep_includes := -I$(neml_DIR)/rapidxml -I$(neml_DIR)/../neml_extra_include +neml_dep_includes := -I$(neml_DIR)/rapidxml -I$(BLACKBEAR_DIR)/contrib/neml_extra_include $(APPLICATION_DIR)/lib/libblackbear-$(METHOD).la: $(neml_LIB) @@ -23,7 +23,7 @@ $(neml_DIR)/src/%.$(obj-suffix) : $(neml_DIR)/src/%.cxx @$(libmesh_LIBTOOL) --tag=CXX $(LIBTOOLFLAGS) --mode=compile --quiet \ $(libmesh_CXX) $(libmesh_CPPFLAGS) $(ADDITIONAL_CPPFLAGS) $(libmesh_CXXFLAGS) $(neml_dep_includes) $(app_INCLUDES) $(libmesh_INCLUDE) -w -DHAVE_CONFIG_H -MMD -MP -MF $@.d -MT $@ -c $< -o $@ -ADDITIONAL_INCLUDES += -I$(neml_includes) +ADDITIONAL_INCLUDES += -I$(neml_includes) $(neml_dep_includes) ADDITIONAL_LIBS += -L$(neml_DIR) -lneml-$(METHOD) ADDITIONAL_CPPFLAGS += -DNEML_ENABLED