Workflows

.github/workflows/gh-pages.yml

@@ -20,17 +20,14 @@ jobs:
       - name: install dependencies
         run: sudo apt-get install emacs26 autoconf
 
-      - name: install htmlize
-        run: git clone https://github.com/hniksic/emacs-htmlize && cp emacs-htmlize/htmlize.el share/doc/qmckl/html/
-
-      - name: ./autogen.sh
-        run: ./autogen.sh
+      - name: autoreconf
+        run: autoreconf -i 
 
       - name: ./configure
-        run: ./configure --without-munit
+        run: QMCKL_DEVEL=1 ./configure --enable-silent-rules --enable-maintainer-mode
 
       - name: make
-        run: make -C src/ doc && ls -sh ./share/doc/qmckl/html/
+        run: make -j 8 html
 
       - name: pwd
         run: pwd
@@ -38,12 +35,6 @@ jobs:
       - name: ls
         run: ls -sh ./share/doc/qmckl/html/
 
-#     - name: Deploy
-#       uses: peaceiris/actions-gh-pages@v3
-#       with:
-#         github_token: ${{ secrets.GITHUB_TOKEN }}
-#         publish_dir: ./share/doc/qmckl/html/
-
       - name: Deploy
         uses: JamesIves/github-pages-deploy-action@4.1.0
         with:

.github/workflows/test-build.yml

@@ -15,18 +15,13 @@ jobs:
     - uses: actions/checkout@v2
     - name: install dependencies
       run: sudo apt-get install emacs autoconf
-    - name: Checkout submodules using a PAT
-      run: |
-           git config --file .gitmodules --get-regexp url | while read url; do
-             git config --file=.gitmodules $(echo "$url" | sed -E "s/git@github.com:|https:\/\/github.com\//https:\/\/${{ secrets.CI_PAT }}:${{ secrets.CI_PAT }}@github.com\//")
-           done
-           git submodule sync
-           git submodule update --init --recursive
-    - name: ./autogen.sh
-      run: ./autogen.sh
+    - name: autoreconf
+      run: autoreconf -i
     - name: ./configure
-      run: ./configure --with-debug
-    - name: make
-      run: make -C src/ check
+      run: QMCKL_DEVEL=1 ./configure --enable-silent-rules --enable-maintainer-mode --enable-debug
     - name: make
+      run: make -j 8
+    - name: make check
+      run: make -j check
+    - name: make distcheck
       run: make distcheck

Makefile.am

@@ -47,11 +47,11 @@ pkgconfig_DATA = pkgconfig/qmckl.pc
 qmckl_h = $(srcdir)/include/qmckl.h
 include_HEADERS = $(qmckl_h)
 
-qmckl_f  = $(srcdir)/share/qmckl/fortran/qmckl_f.f90
-test_qmckl_f = $(srcdir)/tests/qmckl_f.f90
-test_qmckl_fo = $(srcdir)/tests/qmckl_f.o
-src_qmckl_f = $(srcdir)/src/qmckl_f.f90
-src_qmckl_fo = $(srcdir)/src/qmckl_f.o
+qmckl_f  = share/qmckl/fortran/qmckl_f.f90
+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
 
 fortrandir = $(datadir)/$(PACKAGE_NAME)/fortran/
 dist_fortran_DATA = $(qmckl_f)
@@ -61,14 +61,14 @@ AM_CPPFLAGS = -I$(srcdir)/src -I$(srcdir)/include
 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)
 
-export srcdir qmckl_f qmckl_h
+export qmckl_f qmckl_h srcdir
 
 CLEANFILES+=$(test_qmckl_f) $(src_qmckl_f) $(test_qmckl_o) $(src_qmckl_o) \
             $(qmckl_h) $(qmckl_f)
 
-htmlize_el=$(srcdir)/share/doc/qmckl/html/htmlize.el
+htmlize_el=share/doc/qmckl/html/htmlize.el
 
-include $(srcdir)/generated.mk
+include generated.mk
 
 
 ln_s_verbose   = $(ln_s_verbose_@AM_V@)
@@ -76,32 +76,31 @@ ln_s_verbose_  = $(ln_s_verbose_@AM_DEFAULT_V@)
 ln_s_verbose_0 = @echo "  LN_S     $<";
 
 htmldir = $(docdir)/html
-dist_html_DATA = $(HTML_FILES) $(srcdir)/share/doc/qmckl/html/index.html
+dist_html_DATA = $(HTML_FILES) share/doc/qmckl/html/index.html
 
 textdir = $(docdir)/text
 dist_text_DATA = $(TEXT_FILES)
 
-$(srcdir)/generated.mk: $(ORG_FILES)
+generated.mk: $(ORG_FILES)
 	$(srcdir)/tools/build_makefile.sh
 
 $(test_qmckl_fo): $(test_qmckl_f)
-$(test_qmckl_f): $(qmckl_f)
-	cp $(qmckl_f) $(test_qmckl_f)
+$(test_qmckl_f): $(srcdir)/$(qmckl_f)
+	cp $(srcdir)/$(qmckl_f) $(test_qmckl_f)
 
 $(src_qmckl_fo): $(src_qmckl_f)
-$(src_qmckl_f): $(qmckl_f)
-	cp $(qmckl_f) $(src_qmckl_f)
+$(src_qmckl_f): $(srcdir)/$(qmckl_f)
+	cp $(srcdir)/$(qmckl_f) $(src_qmckl_f)
 
-$(srcdir)/share/doc/qmckl/html/index.html: $(srcdir)/share/doc/qmckl/html/README.html
-	$(ln_s_verbose)cd $(srcdir)/share/doc/qmckl/html/ && \
+share/doc/qmckl/html/index.html: share/doc/qmckl/html/README.html
+	$(ln_s_verbose)cd share/doc/qmckl/html/ && \
 	$(LN_S) --force README.html index.html
 
-rpms srcrpm:
-	for dir in $(SUBDIRS); do \
-	  (cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
-	done
 
-.PHONY: rpms srcrpm
+html: $(HTML_FILES)
+text: $(TEXT_FILES)
+doc: html text
+
 
 
 if QMCKL_DEVEL
@@ -110,7 +109,7 @@ dist_src_DATA = $(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) $(qmckl_f) $(qmckl_h)
 
-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) $(srcdir)/share/doc/qmckl/html/index.html $(EXPORTED_FILES)
+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) share/doc/qmckl/html/index.html $(EXPORTED_FILES)
 
 EXTRA_DIST +=                 \
     tools/build_doc.sh        \

tools/build_makefile.sh

@@ -30,17 +30,17 @@ function make_src()
 
     for org in org/*.org ; do
         i=$(basename ${org%.org})
-        tangled="\$(srcdir)/org/${i}.tangled"
-        exported="\$(srcdir)/org/${i}.exported"
-        c_test_x="\$(srcdir)/tests/test_${i}"
-        c_test_o="\$(srcdir)/tests/test_${i}.\$(OBJEXT)"
-        f_test_o="\$(srcdir)/tests/test_${i}_f.\$(OBJEXT)"
-        c_test="\$(srcdir)/tests/test_${i}.c"
-        f_test="\$(srcdir)/tests/test_${i}_f.f90"
-        html="\$(srcdir)/share/doc/qmckl/html/${i}.html"
-        text="\$(srcdir)/share/doc/qmckl/text/${i}.txt"
+        tangled="org/${i}.tangled"
+        exported="org/${i}.exported"
+        c_test_x="tests/test_${i}"
+        c_test_o="tests/test_${i}.\$(OBJEXT)"
+        f_test_o="tests/test_${i}_f.\$(OBJEXT)"
+        c_test="tests/test_${i}.c"
+        f_test="tests/test_${i}_f.f90"
+        html="share/doc/qmckl/html/${i}.html"
+        text="share/doc/qmckl/text/${i}.txt"
 
-        i="\$(srcdir)/src/${i}"
+        i="src/${i}"
 
         c="${i}.c"
         o="${i}.\$(OBJEXT)"