Commit e1d4e4cb authored by Mulas, Giacomo's avatar Mulas, Giacomo
Browse files

pass library to make -c ../libnptm in all other Makefiles, add comments

parent d022aab5

src/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ override BUILDDIR_NPTM=$(BUILDDIR)/libnptm 
endif

ifndef LIBNPTM

# choose one of the two following lines, depending on whether a static or dynamic libnptm is wanted

#override LIBNPTM=$(BUILDDIR_NPTM)/libnptm.a

override LIBNPTM=$(BUILDDIR_NPTM)/libnptm.so

override LIBNPTM=$(BUILDDIR_NPTM)/libnptm.a

#override LIBNPTM=$(BUILDDIR_NPTM)/libnptm.so

endif

DOCSDIR=$(SRCDIR)/../doc

src/cluster/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ $(OBJDIR): 
	mkdir -p $(OBJDIR)



$(LIBNPTM):

	$(MAKE) -C ../libnptm $@

	BUILDDIR=$(BUILDDIR) BUILDDIR_NPTM=$(BUILDDIR_NPTM) LIBNPTM=$(LIBNPTM) $(MAKE) -C ../libnptm $@



$(BUILDDIR_CLU):

	mkdir -p $(BUILDDIR_CLU)
@@ -42,6 +42,7 @@ $(BUILDDIR_CLU)/clu: $(OBJDIR) $(OBJDIR)/clu.o $(BUILDDIR_CLU) 
$(BUILDDIR_CLU)/edfb_clu: $(OBJDIR) $(OBJDIR)/edfb_clu.o $(BUILDDIR_CLU)

	$(FC) $(FCFLAGS) -o $(BUILDDIR_CLU)/edfb_clu $(OBJDIR)/edfb_clu.o $(LDFLAGS)



# We put $(LIBNPTM) as an object to link in directly, so that it will be found at runtime even if it is a shared object library. May change in the future when we have an install: target

$(BUILDDIR_CLU)/np_cluster: $(OBJDIR) $(CXX_CLU_OBJS) $(BUILDDIR_CLU) $(LIBNPTM)

	$(CXX) $(CXXFLAGS) -o $(BUILDDIR_CLU)/np_cluster $(CXX_CLU_OBJS) $(LIBNPTM) $(CXXLDFLAGS)

src/sphere/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ $(OBJDIR): 
	mkdir -p $(OBJDIR)



$(LIBNPTM):

	$(MAKE) -C ../libnptm $@

	BUILDDIR=$(BUILDDIR) BUILDDIR_NPTM=$(BUILDDIR_NPTM) LIBNPTM=$(LIBNPTM) $(MAKE) -C ../libnptm $@



$(BUILDDIR_SPH):

	mkdir -p $(BUILDDIR_SPH)
@@ -41,6 +41,7 @@ $(BUILDDIR_SPH)/edfb_sph: $(OBJDIR) $(OBJDIR)/edfb_sph.o $(BUILDDIR_SPH) 
$(BUILDDIR_SPH)/sph: $(OBJDIR) $(OBJDIR)/sph.o $(BUILDDIR_SPH)

	$(FC) $(FCFLAGS) -o $(BUILDDIR_SPH)/sph $(OBJDIR)/sph.o $(LDFLAGS)



# We put $(LIBNPTM) as an object to link in directly, so that it will be found at runtime even if it is a shared object library. May change in the future when we have an install: target

$(BUILDDIR_SPH)/np_sphere: $(OBJDIR) $(CXX_SPH_OBJS) $(BUILDDIR_SPH) $(LIBNPTM)

	$(CXX) $(CXXFLAGS) -o $(BUILDDIR_SPH)/np_sphere $(CXX_SPH_OBJS) $(LIBNPTM) $(CXXLDFLAGS)

src/testing/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -29,14 +29,16 @@ $(OBJDIR): 
	mkdir -p $(OBJDIR)



$(LIBNPTM):

	$(MAKE) -C ../libnptm $@

	BUILDDIR=$(BUILDDIR) BUILDDIR_NPTM=$(BUILDDIR_NPTM) LIBNPTM=$(LIBNPTM) $(MAKE) -C ../libnptm $@



$(BUILDDIR_TEST):

	mkdir -p $(BUILDDIR_TEST)



# We put $(LIBNPTM) as an object to link in directly, so that it will be found at runtime even if it is a shared object library. May change in the future when we have an install: target

$(BUILDDIR_TEST)/test_TEDF: $(OBJDIR) $(CXX_TEDF_OBJS) $(BUILDDIR_TEST) $(LIBNPTM)

	$(CXX) $(CXXFLAGS) -o $(BUILDDIR_TEST)/test_TEDF $(CXX_TEDF_OBJS) $(LIBNPTM) $(CXXLDFLAGS) 



# We put $(LIBNPTM) as an object to link in directly, so that it will be found at runtime even if it is a shared object library. May change in the future when we have an install: target

$(BUILDDIR_TEST)/test_TTMS: $(OBJDIR) $(CXX_TTMS_OBJS) $(BUILDDIR_TEST) $(LIBNPTM)

	$(CXX) $(CXXFLAGS) -o $(BUILDDIR_TEST)/test_TTMS $(CXX_TTMS_OBJS) $(LIBNPTM) $(CXXLDFLAGS)

src/trapping/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ $(OBJDIR): 
	mkdir -p $(OBJDIR)



$(LIBNPTM):

	$(MAKE) -C ../libnptm $@

	BUILDDIR=$(BUILDDIR) BUILDDIR_NPTM=$(BUILDDIR_NPTM) LIBNPTM=$(LIBNPTM) $(MAKE) -C ../libnptm $@



$(BUILDDIR_TRA):

	mkdir -p $(BUILDDIR_TRA)
@@ -40,6 +40,7 @@ $(BUILDDIR_TRA)/frfme: $(OBJDIR) $(OBJDIR)/frfme.o $(BUILDDIR_TRA) 
$(BUILDDIR_TRA)/lffft: $(OBJDIR) $(OBJDIR)/lffft.o $(BUILDDIR_TRA)

	$(FC) $(FCFLAGS) -o $(BUILDDIR_TRA)/lffft $(OBJDIR)/lffft.o $(LDFLAGS)



# We put $(LIBNPTM) as an object to link in directly, so that it will be found at runtime even if it is a shared object library. May change in the future when we have an install: target

$(BUILDDIR_TRA)/np_trapping: $(OBJDIR) $(CXX_TRAP_OBJS) $(BUILDDIR_TRA) $(LIBNPTM)

	$(CXX) $(CXXFLAGS) -o $(BUILDDIR_TRA)/np_trapping $(CXX_TRAP_OBJS) $(LIBNPTM) $(CXXLDFLAGS)

src/libnptm/Makefile

+1 −1

File changed.

Contains only whitespace changes.