branch: master
commit 14b574e0ef49c45ecb582bbe95342745381ebe5c
Author: Yves Renard <[email protected]>
AuthorDate: Sat May 23 15:54:02 2020 +0200
regularising status of getfem_im_list.h
---
.gitignore | 1 +
cubature/Makefile.am | 3 ---
src/Makefile.am | 7 +++++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 796f14a..4dd8688 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ Makefile
/config.h
/config.status
/cubature/getfem_im_list.h
+/src/getfem/getfem_im_list.h
/getfem-config
/getfem-config-notinstalled
/gmm-config
diff --git a/cubature/Makefile.am b/cubature/Makefile.am
index e1ad1a5..58f811c 100644
--- a/cubature/Makefile.am
+++ b/cubature/Makefile.am
@@ -22,8 +22,5 @@ EXTRA_DIST = $(IM_METHODS_LOC) make_getfem_im_list
getfem_im_list.h
getfem_im_list.h : $(IM_METHODS)
$(top_srcdir)/cubature/make_getfem_im_list $(top_srcdir)/cubature
- cp ./getfem_im_list.h ../src/getfem/getfem_im_list.h
-
-
CLEANFILES = getfem_im_list.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 085186d..16d06fc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -247,12 +247,15 @@ SRC =
\
getfem_continuation.cc
# getfem_enumeration_dof_para.cc
+getfem/getfem_im_list.h : ../cubature/getfem_im_list.h
+ cp ../cubature/getfem_im_list.h getfem/getfem_im_list.h
+
lib_LTLIBRARIES = libgetfem.la
libgetfem_la_SOURCES = $(SRC)
libgetfem_la_LDFLAGS = ${LIBTOOL_VERSION_INFO}
libgetfem_la_LIBADD = @SUPERLU_LIBS@ @MUMPS_LIBS@
AM_CPPFLAGS = -I$(top_srcdir)/src -I../src -I$(top_srcdir)
-CLEANFILES = ii_files/* *.o.d
-DISTCLEANFILES = getfem/getfem_im_list.h getfem/getfem_arch_config.h
gmm/gmm_arch_config.h
+CLEANFILES = ii_files/* *.o.d getfem/getfem_im_list.h
+DISTCLEANFILES = getfem/getfem_arch_config.h gmm/gmm_arch_config.h
