Update Makefile and gitignore configurations to handle inclusion folders (462c491f) · Commits · Giacomo Mulas / NP_TMcode

.gitignore

+2 −1

Original line number	Diff line number	Diff line
		@@ -2,12 +2,13 @@ build/autom4te.cache
		build/config.*
		build/cluster/*
		build/error.log
		build/inclusion/*
		build/libnptm/*
		build/libtool
		build/Makefile
		build/sphere/*
		build/testing/*
		build/trapping/*
		build/libnptm/*
		containers/singularity/*.sif
		doc/build/*
		src/libnptm/.libs

build/Makefile.am

+5 −1

Original line number	Diff line number	Diff line
		@@ -2,16 +2,20 @@ LDADD=libnptm/libnptm.la -L/usr/lib64 ${USER_LDFLAGS} ${HDF5_LDFLAGS} ${LAPACKLD
		lib_LTLIBRARIES=libnptm/libnptm.la
		libnptm_libnptm_la_SOURCES=../src/libnptm/algebraic.cpp ../src/libnptm/clu_subs.cpp ../src/libnptm/Commons.cpp ../src/libnptm/Configuration.cpp ../src/libnptm/file_io.cpp ../src/libnptm/lapack_calls.cpp ../src/libnptm/logging.cpp ../src/libnptm/magma_calls.cpp ../src/libnptm/Parsers.cpp ../src/libnptm/sph_subs.cpp ../src/libnptm/utils.cpp ../src/libnptm/tfrfme.cpp ../src/libnptm/TransitionMatrix.cpp ../src/libnptm/tra_subs.cpp
		if BUILDFORTRAN
		PROGS=cluster/edfb_clu cluster/clu cluster/np_cluster sphere/edfb_sph sphere/sph sphere/np_sphere trapping/frfme trapping/lffft trapping/np_trapping testing/test_TEDF testing/test_TTMS
		PROGS=cluster/edfb_clu cluster/clu cluster/np_cluster inclusion/edfb_inclu inclusion/inclu sphere/edfb_sph sphere/sph sphere/np_sphere trapping/frfme trapping/lffft trapping/np_trapping testing/test_TEDF testing/test_TTMS
		bin_PROGRAMS=$(PROGS)
		EDFBCLUSOURCES=../src/cluster/edfb_clu.f
		CLUSOURCES=../src/cluster/clu.f
		EDFBINCLUSOURCES=../src/inclusion/edfb_inclu.f
		INCLUSOURCES=../src/inclusion/inclu.f
		EDFBSPHSOURCES=../src/sphere/edfb_sph.f
		SPHSOURCES=../src/sphere/sph.f
		FRFMESOURCES=../src/trapping/frfme.f
		LFFFTSOURCES=../src/trapping/lffft.f
		cluster_edfb_clu_SOURCES=$(EDFBCLUSOURCES)
		cluster_clu_SOURCES=$(CLUSOURCES)
		inclusion_edfb_inclu_SOURCES=$(EDFBINCLUSOURCES)
		inclusion_inclu_SOURCES=$(INCLUSOURCES)
		sphere_edfb_sph_SOURCES=$(EDFBSPHSOURCES)
		sphere_sph_SOURCES=$(SPHSOURCES)
		trapping_frfme_SOURCES=$(FRFMESOURCES)

build/Makefile.in

+62 −9

Original line number	Diff line number	Diff line
		@@ -111,6 +111,8 @@ CONFIG_CLEAN_VPATH_FILES =
		@BUILDFORTRAN_TRUE@am__EXEEXT_1 = cluster/edfb_clu$(EXEEXT) \
		@BUILDFORTRAN_TRUE@ cluster/clu$(EXEEXT) \
		@BUILDFORTRAN_TRUE@ cluster/np_cluster$(EXEEXT) \
		@BUILDFORTRAN_TRUE@ inclusion/edfb_inclu$(EXEEXT) \
		@BUILDFORTRAN_TRUE@ inclusion/inclu$(EXEEXT) \
		@BUILDFORTRAN_TRUE@ sphere/edfb_sph$(EXEEXT) \
		@BUILDFORTRAN_TRUE@ sphere/sph$(EXEEXT) \
		@BUILDFORTRAN_TRUE@ sphere/np_sphere$(EXEEXT) \
		@@ -194,9 +196,26 @@ cluster_np_cluster_LDADD = $(LDADD)
		cluster_np_cluster_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__inclusion_edfb_inclu_SOURCES_DIST = ../src/inclusion/edfb_inclu.f
		@BUILDFORTRAN_TRUE@am__objects_3 = \
		@BUILDFORTRAN_TRUE@ ../src/inclusion/edfb_inclu.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_inclusion_edfb_inclu_OBJECTS = $(am__objects_3)
		inclusion_edfb_inclu_OBJECTS = $(am_inclusion_edfb_inclu_OBJECTS)
		inclusion_edfb_inclu_LDADD = $(LDADD)
		inclusion_edfb_inclu_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__inclusion_inclu_SOURCES_DIST = ../src/inclusion/inclu.f
		@BUILDFORTRAN_TRUE@am__objects_4 = ../src/inclusion/inclu.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_inclusion_inclu_OBJECTS = $(am__objects_4)
		inclusion_inclu_OBJECTS = $(am_inclusion_inclu_OBJECTS)
		inclusion_inclu_LDADD = $(LDADD)
		inclusion_inclu_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__sphere_edfb_sph_SOURCES_DIST = ../src/sphere/edfb_sph.f
		@BUILDFORTRAN_TRUE@am__objects_3 = ../src/sphere/edfb_sph.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_sphere_edfb_sph_OBJECTS = $(am__objects_3)
		@BUILDFORTRAN_TRUE@am__objects_5 = ../src/sphere/edfb_sph.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_sphere_edfb_sph_OBJECTS = $(am__objects_5)
		sphere_edfb_sph_OBJECTS = $(am_sphere_edfb_sph_OBJECTS)
		sphere_edfb_sph_LDADD = $(LDADD)
		sphere_edfb_sph_DEPENDENCIES = libnptm/libnptm.la \
		@@ -216,8 +235,8 @@ sphere_np_sphere_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__sphere_sph_SOURCES_DIST = ../src/sphere/sph.f
		@BUILDFORTRAN_TRUE@am__objects_4 = ../src/sphere/sph.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_sphere_sph_OBJECTS = $(am__objects_4)
		@BUILDFORTRAN_TRUE@am__objects_6 = ../src/sphere/sph.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_sphere_sph_OBJECTS = $(am__objects_6)
		sphere_sph_OBJECTS = $(am_sphere_sph_OBJECTS)
		sphere_sph_LDADD = $(LDADD)
		sphere_sph_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \
		@@ -244,16 +263,16 @@ testing_test_TTMS_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__trapping_frfme_SOURCES_DIST = ../src/trapping/frfme.f
		@BUILDFORTRAN_TRUE@am__objects_5 = ../src/trapping/frfme.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_trapping_frfme_OBJECTS = $(am__objects_5)
		@BUILDFORTRAN_TRUE@am__objects_7 = ../src/trapping/frfme.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_trapping_frfme_OBJECTS = $(am__objects_7)
		trapping_frfme_OBJECTS = $(am_trapping_frfme_OBJECTS)
		trapping_frfme_LDADD = $(LDADD)
		trapping_frfme_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		am__trapping_lffft_SOURCES_DIST = ../src/trapping/lffft.f
		@BUILDFORTRAN_TRUE@am__objects_6 = ../src/trapping/lffft.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_trapping_lffft_OBJECTS = $(am__objects_6)
		@BUILDFORTRAN_TRUE@am__objects_8 = ../src/trapping/lffft.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_trapping_lffft_OBJECTS = $(am__objects_8)
		trapping_lffft_OBJECTS = $(am_trapping_lffft_OBJECTS)
		trapping_lffft_LDADD = $(LDADD)
		trapping_lffft_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \
		@@ -367,6 +386,7 @@ am__v_CCLD_0 = @echo " CCLD " $@;
		am__v_CCLD_1 =
		SOURCES = $(libnptm_libnptm_la_SOURCES) $(cluster_clu_SOURCES) \
		$(cluster_edfb_clu_SOURCES) $(cluster_np_cluster_SOURCES) \
		$(inclusion_edfb_inclu_SOURCES) $(inclusion_inclu_SOURCES) \
		$(sphere_edfb_sph_SOURCES) $(sphere_np_sphere_SOURCES) \
		$(sphere_sph_SOURCES) $(testing_test_TEDF_SOURCES) \
		$(testing_test_TTMS_SOURCES) $(trapping_frfme_SOURCES) \
		@@ -375,6 +395,8 @@ DIST_SOURCES = $(libnptm_libnptm_la_SOURCES) \
		$(am__cluster_clu_SOURCES_DIST) \
		$(am__cluster_edfb_clu_SOURCES_DIST) \
		$(am__cluster_np_cluster_SOURCES_DIST) \
		$(am__inclusion_edfb_inclu_SOURCES_DIST) \
		$(am__inclusion_inclu_SOURCES_DIST) \
		$(am__sphere_edfb_sph_SOURCES_DIST) \
		$(am__sphere_np_sphere_SOURCES_DIST) \
		$(am__sphere_sph_SOURCES_DIST) \
		@@ -582,15 +604,19 @@ LDADD = libnptm/libnptm.la -L/usr/lib64 ${USER_LDFLAGS} ${HDF5_LDFLAGS} ${LAPACK
		lib_LTLIBRARIES = libnptm/libnptm.la
		libnptm_libnptm_la_SOURCES = ../src/libnptm/algebraic.cpp ../src/libnptm/clu_subs.cpp ../src/libnptm/Commons.cpp ../src/libnptm/Configuration.cpp ../src/libnptm/file_io.cpp ../src/libnptm/lapack_calls.cpp ../src/libnptm/logging.cpp ../src/libnptm/magma_calls.cpp ../src/libnptm/Parsers.cpp ../src/libnptm/sph_subs.cpp ../src/libnptm/utils.cpp ../src/libnptm/tfrfme.cpp ../src/libnptm/TransitionMatrix.cpp ../src/libnptm/tra_subs.cpp
		@BUILDFORTRAN_FALSE@PROGS = cluster/np_cluster sphere/np_sphere trapping/np_trapping testing/test_TEDF testing/test_TTMS
		@BUILDFORTRAN_TRUE@PROGS = cluster/edfb_clu cluster/clu cluster/np_cluster sphere/edfb_sph sphere/sph sphere/np_sphere trapping/frfme trapping/lffft trapping/np_trapping testing/test_TEDF testing/test_TTMS
		@BUILDFORTRAN_TRUE@PROGS = cluster/edfb_clu cluster/clu cluster/np_cluster inclusion/edfb_inclu inclusion/inclu sphere/edfb_sph sphere/sph sphere/np_sphere trapping/frfme trapping/lffft trapping/np_trapping testing/test_TEDF testing/test_TTMS
		@BUILDFORTRAN_TRUE@EDFBCLUSOURCES = ../src/cluster/edfb_clu.f
		@BUILDFORTRAN_TRUE@CLUSOURCES = ../src/cluster/clu.f
		@BUILDFORTRAN_TRUE@EDFBINCLUSOURCES = ../src/inclusion/edfb_inclu.f
		@BUILDFORTRAN_TRUE@INCLUSOURCES = ../src/inclusion/inclu.f
		@BUILDFORTRAN_TRUE@EDFBSPHSOURCES = ../src/sphere/edfb_sph.f
		@BUILDFORTRAN_TRUE@SPHSOURCES = ../src/sphere/sph.f
		@BUILDFORTRAN_TRUE@FRFMESOURCES = ../src/trapping/frfme.f
		@BUILDFORTRAN_TRUE@LFFFTSOURCES = ../src/trapping/lffft.f
		@BUILDFORTRAN_TRUE@cluster_edfb_clu_SOURCES = $(EDFBCLUSOURCES)
		@BUILDFORTRAN_TRUE@cluster_clu_SOURCES = $(CLUSOURCES)
		@BUILDFORTRAN_TRUE@inclusion_edfb_inclu_SOURCES = $(EDFBINCLUSOURCES)
		@BUILDFORTRAN_TRUE@inclusion_inclu_SOURCES = $(INCLUSOURCES)
		@BUILDFORTRAN_TRUE@sphere_edfb_sph_SOURCES = $(EDFBSPHSOURCES)
		@BUILDFORTRAN_TRUE@sphere_sph_SOURCES = $(SPHSOURCES)
		@BUILDFORTRAN_TRUE@trapping_frfme_SOURCES = $(FRFMESOURCES)
		@@ -795,6 +821,28 @@ cluster/edfb_clu$(EXEEXT): $(cluster_edfb_clu_OBJECTS) $(cluster_edfb_clu_DEPEND
		cluster/np_cluster$(EXEEXT): $(cluster_np_cluster_OBJECTS) $(cluster_np_cluster_DEPENDENCIES) $(EXTRA_cluster_np_cluster_DEPENDENCIES) cluster/$(am__dirstamp)
		@rm -f cluster/np_cluster$(EXEEXT)
		$(AM_V_CXXLD)$(CXXLINK) $(cluster_np_cluster_OBJECTS) $(cluster_np_cluster_LDADD) $(LIBS)
		../src/inclusion/$(am__dirstamp):
		@$(MKDIR_P) ../src/inclusion
		@: > ../src/inclusion/$(am__dirstamp)
		../src/inclusion/$(DEPDIR)/$(am__dirstamp):
		@$(MKDIR_P) ../src/inclusion/$(DEPDIR)
		@: > ../src/inclusion/$(DEPDIR)/$(am__dirstamp)
		../src/inclusion/edfb_inclu.$(OBJEXT): \
		../src/inclusion/$(am__dirstamp) \
		../src/inclusion/$(DEPDIR)/$(am__dirstamp)
		inclusion/$(am__dirstamp):
		@$(MKDIR_P) inclusion
		@: > inclusion/$(am__dirstamp)

		inclusion/edfb_inclu$(EXEEXT): $(inclusion_edfb_inclu_OBJECTS) $(inclusion_edfb_inclu_DEPENDENCIES) $(EXTRA_inclusion_edfb_inclu_DEPENDENCIES) inclusion/$(am__dirstamp)
		@rm -f inclusion/edfb_inclu$(EXEEXT)
		$(AM_V_F77LD)$(F77LINK) $(inclusion_edfb_inclu_OBJECTS) $(inclusion_edfb_inclu_LDADD) $(LIBS)
		../src/inclusion/inclu.$(OBJEXT): ../src/inclusion/$(am__dirstamp) \
		../src/inclusion/$(DEPDIR)/$(am__dirstamp)

		inclusion/inclu$(EXEEXT): $(inclusion_inclu_OBJECTS) $(inclusion_inclu_DEPENDENCIES) $(EXTRA_inclusion_inclu_DEPENDENCIES) inclusion/$(am__dirstamp)
		@rm -f inclusion/inclu$(EXEEXT)
		$(AM_V_F77LD)$(F77LINK) $(inclusion_inclu_OBJECTS) $(inclusion_inclu_LDADD) $(LIBS)
		../src/sphere/$(am__dirstamp):
		@$(MKDIR_P) ../src/sphere
		@: > ../src/sphere/$(am__dirstamp)
		@@ -881,6 +929,7 @@ trapping/np_trapping$(EXEEXT): $(trapping_np_trapping_OBJECTS) $(trapping_np_tra
		mostlyclean-compile:
		-rm -f *.$(OBJEXT)
		-rm -f ../src/cluster/*.$(OBJEXT)
		-rm -f ../src/inclusion/*.$(OBJEXT)
		-rm -f ../src/libnptm/*.$(OBJEXT)
		-rm -f ../src/libnptm/*.lo
		-rm -f ../src/sphere/*.$(OBJEXT)
		@@ -960,6 +1009,7 @@ clean-libtool:
		-rm -rf .libs _libs
		-rm -rf ../src/libnptm/.libs ../src/libnptm/_libs
		-rm -rf cluster/.libs cluster/_libs
		-rm -rf inclusion/.libs inclusion/_libs
		-rm -rf libnptm/.libs libnptm/_libs
		-rm -rf sphere/.libs sphere/_libs
		-rm -rf testing/.libs testing/_libs
		@@ -1235,6 +1285,8 @@ distclean-generic:
		-test . = "$(srcdir)" \|\| test -z "$(CONFIG_CLEAN_VPATH_FILES)" \|\| rm -f $(CONFIG_CLEAN_VPATH_FILES)
		-rm -f ../src/cluster/$(DEPDIR)/$(am__dirstamp)
		-rm -f ../src/cluster/$(am__dirstamp)
		-rm -f ../src/inclusion/$(DEPDIR)/$(am__dirstamp)
		-rm -f ../src/inclusion/$(am__dirstamp)
		-rm -f ../src/libnptm/$(DEPDIR)/$(am__dirstamp)
		-rm -f ../src/libnptm/$(am__dirstamp)
		-rm -f ../src/sphere/$(DEPDIR)/$(am__dirstamp)
		@@ -1244,6 +1296,7 @@ distclean-generic:
		-rm -f ../src/trapping/$(DEPDIR)/$(am__dirstamp)
		-rm -f ../src/trapping/$(am__dirstamp)
		-rm -f cluster/$(am__dirstamp)
		-rm -f inclusion/$(am__dirstamp)
		-rm -f libnptm/$(am__dirstamp)
		-rm -f sphere/$(am__dirstamp)
		-rm -f testing/$(am__dirstamp)