TREX/qmckl
1
0
Fork 0
mirror of https://github.com/TREX-CoE/qmckl.git synced 2024-10-02 06:21:07 +02:00
Code Issues Projects Releases Wiki Activity

Moved qmckl_f.F90 into include

Browse Source
This commit is contained in:
Anthony Scemama 2022-12-09 11:19:26 +01:00
parent 2fdc4ea432
commit 0c5c2bed41
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile.am
View File

@ -45,12 +45,9 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = pkgconfig/qmckl.pc
qmckl_h = include/qmckl.h
include_HEADERS = $(qmckl_h) $(src_qmckl_f)
qmckl_f = include/qmckl_f.F90
include_HEADERS = $(qmckl_h) $(qmckl_f)
test_qmckl_f = tests/qmckl_f.F90
test_qmckl_fo = tests/qmckl_f.o
src_qmckl_f = src/qmckl_f.F90
src_qmckl_fo = src/qmckl_f.o
header_tests = tests/chbrclf.h tests/n2.h
QMCKL_TEST_DIR = $(abs_srcdir)/share/qmckl/test_data/
@ -61,7 +58,7 @@ AM_CPPFLAGS += -DQMCKL_TEST_DIR=\"$(QMCKL_TEST_DIR)\"
lib_LTLIBRARIES = src/libqmckl.la
src_libqmckl_la_SOURCES = $(qmckl_h) $(src_qmckl_f) $(C_FILES) $(F_FILES) $(H_PRIVATE_FUNC_FILES) $(H_PRIVATE_TYPE_FILES)
src_libqmckl_la_SOURCES = $(qmckl_h) $(qmckl_f) $(C_FILES) $(F_FILES) $(H_PRIVATE_FUNC_FILES) $(H_PRIVATE_TYPE_FILES)
src_libqmckl_la_LDFLAGS = $(LDFLAGS)
CLEANFILES+=$(test_qmckl_fo) $(src_qmckl_fo) $(test_qmckl_o) $(src_qmckl_o) $(FH_TYPE_FILES) $(FH_FUNC_FILES)
@ -137,11 +134,11 @@ AM_LDFLAGS=-lvfc_probes -lvfc_probes_f
ACLOCAL_AMFLAGS += -I tools
endif
EXTRA_DIST += $(ORG_FILES) $(TANGLED_FILES) $(EXPORTED_FILES) $(test_qmckl_f)
EXTRA_DIST += $(ORG_FILES) $(TANGLED_FILES) $(EXPORTED_FILES)
BUILT_SOURCES = $(C_FILES) $(F_FILES) $(FH_FUNC_FILES) $(FH_TYPE_FILES) $(H_FUNC_FILES) $(H_TYPE_FILES) $(H_PRIVATE_FUNC_FILES) $(H_PRIVATE_TYPE_FILES) $(src_qmckl_f) $(test_qmckl_f) $(qmckl_h) $(header_tests) $(htmlize_el)
BUILT_SOURCES = $(C_FILES) $(F_FILES) $(FH_FUNC_FILES) $(FH_TYPE_FILES) $(H_FUNC_FILES) $(H_TYPE_FILES) $(H_PRIVATE_FUNC_FILES) $(H_PRIVATE_TYPE_FILES) $(qmckl_f) $(qmckl_h) $(header_tests) $(htmlize_el)
CLEANFILES += $(BUILT_SOURCES) $(C_TEST_FILES) $(F_TEST_FILES) $(TANGLED_FILES) $(C_TEST_FILES) $(F_TEST_FILES) $(src_qmckl_f) $(test_qmckl_f) $(qmckl_h) $(HTML_FILES) $(TEXT_FILES) $(EXPORTED_FILES) $(header_tests) $(htmlize_el)
CLEANFILES += $(BUILT_SOURCES) $(C_TEST_FILES) $(F_TEST_FILES) $(TANGLED_FILES) $(C_TEST_FILES) $(F_TEST_FILES) $(qmckl_f) $(qmckl_h) $(HTML_FILES) $(TEXT_FILES) $(EXPORTED_FILES) $(header_tests) $(htmlize_el)
EXTRA_DIST += \
tools/build_doc.sh \
@ -178,15 +175,12 @@ cat_h_verbose_0 = @echo " HEADER $@";
SUFFIXES = .F90 .h .org .c _f.F90 _func.h _type.h _private_func.h _private_type.h
$(test_qmckl_f): $(src_qmckl_f)
cp $(src_qmckl_f) $(test_qmckl_f)
$(qmckl_h): $(H_FUNC_FILES) $(H_TYPE_FILES)
$(cat_h_verbose)top_builddir=$(abs_top_builddir) srcdir=$(abs_srcdir) qmckl_h=$(qmckl_h) $(srcdir)/tools/build_qmckl_h.sh
$(src_qmckl_f): $(FH_FUNC_FILES) $(FH_TYPE_FILES)
$(qmckl_f): $(FH_FUNC_FILES) $(FH_TYPE_FILES)
echo $(FH_TYPE_FILES) $(FH_FUNC_FILES)
$(cat_h_verbose)top_builddir=$(abs_top_builddir) srcdir=$(abs_srcdir) src_qmckl_f=$(src_qmckl_f) $(srcdir)/tools/build_qmckl_f.sh
$(cat_h_verbose)top_builddir=$(abs_top_builddir) srcdir=$(abs_srcdir) qmckl_f=$(qmckl_f) $(srcdir)/tools/build_qmckl_f.sh
$(htmlize_el):
$(MKDIR_P) $(htmldir_loc) $(textdir_loc)
@ -218,7 +212,7 @@ $(qmckl_py): $(qmckl_i) $(qmckl_include_i)
$(qmckl_wrap_c): $(qmckl_py)
source: $(TANGLED_FILES) $(qmckl_h) $(src_qmckl_f)
source: $(TANGLED_FILES) $(qmckl_h) $(qmckl_f)
CLEANFILES += $(qmckl_wrap_c) \
$(qmckl_include_i) \

12
tools/build_qmckl_f.sh
View File

@ -20,8 +20,8 @@ if [ -z ${top_builddir} ] ; then
exit 1
fi
if [ -z ${src_qmckl_f} ] ; then
echo "Error: src_qmckl_f environment variable is not defined"
if [ -z ${qmckl_f} ] ; then
echo "Error: qmckl_f environment variable is not defined"
exit 1
fi
@ -33,7 +33,7 @@ fi
HEADERS_TYPE="src/qmckl_*_fh_type.F90"
HEADERS="src/qmckl_*_fh_func.F90"
cat << EOF > ${src_qmckl_f}
cat << EOF > ${qmckl_f}
!
! ------------------------------------------
! QMCkl - Quantum Monte Carlo kernel library
@ -82,14 +82,14 @@ EOF
for i in ${HEADERS_TYPE}
do
cat $i >> ${src_qmckl_f}
cat $i >> ${qmckl_f}
done
for i in ${HEADERS}
do
cat $i >> ${src_qmckl_f}
cat $i >> ${qmckl_f}
done
cat << EOF >> ${src_qmckl_f}
cat << EOF >> ${qmckl_f}
end module qmckl
EOF