Commit c0c4c3ab authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Merge branch 'master' into binary_IO 

Realign binary_IO with cleaner building process

Conflicts:
src/cluster/Makefile
src/sphere/Makefile
parents 3eabce46 e6490bd4

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ build/cluster/* 
build/sphere/*

build/trapping/*

doc/build/*

src/objects/*
 
 No newline at end of file

src/Makefile

+3 −3
Original line number Diff line number Diff line 
SUBDIRS := cluster sphere trapping

SRCDIR=$(PWD)

OBJDIR=$(SRCDIR)/objects

BUILDDIR=$(SRCDIR)/../build

DOCSDIR=$(SRCDIR)/../doc
@@ -12,14 +13,13 @@ $(SUBDIRS): 
	$(MAKE) -C $@



clean:

	rm -f $(BUILDDIR)/cluster/*.o

	rm -f $(BUILDDIR)/sphere/*.o

	rm -f $(BUILDDIR)/trapping/*.o

	rm -f $(OBJDIR)/*.o



wipe:

	rm -f $(BUILDDIR)/cluster/*

	rm -f $(BUILDDIR)/sphere/*

	rm -f $(BUILDDIR)/trapping/*

	rm -f $(OBJDIR)/*.o

	if [ -d $(DOCSDIR)/build/html ]; then rm -r $(DOCSDIR)/build/html; fi

	if [ -d $(DOCSDIR)/build/latex ]; then rm -r $(DOCSDIR)/build/latex; fi

src/cluster/Makefile

+17 −31
Original line number Diff line number Diff line 
BUILDDIR=../../build/cluster

ifndef BUILDDIR

override BUILDDIR=../../build/cluster

endif

ifndef OBJDIR

override OBJDIR=../objects

endif



include ../make.inc





all: clu edfb_clu np_cluster

F_CLU_OBJS=$(OBJDIR)/clu.o $(OBJDIR)/edfb_clu.o



clu: clu.o

	$(FC) $(FCFLAGS) -o $(BUILDDIR)/clu $(BUILDDIR)/clu.o $(LDFLAGS)

CXX_CLU_OBJS=$(OBJDIR)/np_cluster.o $(OBJDIR)/Commons.o $(OBJDIR)/Configuration.o $(OBJDIR)/file_io.o $(OBJDIR)/Parsers.o $(OBJDIR)/sph_subs.o $(OBJDIR)/clu_subs.o $(OBJDIR)/cluster.o $(OBJDIR)/TransitionMatrix.o



edfb_clu: edfb_clu.o

	$(FC) $(FCFLAGS) -o $(BUILDDIR)/edfb_clu $(BUILDDIR)/edfb_clu.o $(LDFLAGS)



np_cluster: $(BUILDDIR)/np_cluster.o $(BUILDDIR)/Commons.o $(BUILDDIR)/Configuration.o $(BUILDDIR)/file_io.o $(BUILDDIR)/Parsers.o $(BUILDDIR)/sph_subs.o $(BUILDDIR)/clu_subs.o $(BUILDDIR)/cluster.o $(BUILDDIR)/TransitionMatrix.o

	$(CXX) $(CXXFLAGS) -o $(BUILDDIR)/np_cluster $(BUILDDIR)/np_cluster.o $(BUILDDIR)/Commons.o $(BUILDDIR)/Configuration.o $(BUILDDIR)/file_io.o $(BUILDDIR)/Parsers.o $(BUILDDIR)/sph_subs.o $(BUILDDIR)/clu_subs.o $(BUILDDIR)/cluster.o $(BUILDDIR)/TransitionMatrix.o $(CXXLDFLAGS) 

all: $(BUILDDIR)/clu $(BUILDDIR)/edfb_clu $(BUILDDIR)/np_cluster



#$(BUILDDIR)/np_cluster.o:

#	$(CXX) $(CXXFLAGS) -c np_cluster.cpp -o $(BUILDDIR)/np_cluster.o

$(BUILDDIR)/clu: $(OBJDIR)/clu.o

	$(FC) $(FCFLAGS) -o $(BUILDDIR)/clu $(OBJDIR)/clu.o $(LDFLAGS)



#$(BUILDDIR)/Commons.o:

#	$(CXX) $(CXXFLAGS) -c ../libnptm/Commons.cpp -o $(BUILDDIR)/Commons.o

$(BUILDDIR)/edfb_clu: $(OBJDIR)/edfb_clu.o

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



#$(BUILDDIR)/Configuration.o:

#	$(CXX) $(CXXFLAGS) -c ../libnptm/Configuration.cpp -o $(BUILDDIR)/Configuration.o



#$(BUILDDIR)/file_io.o:

#	$(CXX) $(CXXFLAGS) -c ../libnptm/file_io.cpp -o $(BUILDDIR)/file_io.o



#$(BUILDDIR)/Parsers.o:

#	$(CXX) $(CXXFLAGS) -c ../libnptm/Parsers.cpp -o $(BUILDDIR)/Parsers.o



#$(BUILDDIR)/cluster.o:

#	$(CXX) $(CXXFLAGS) -c cluster.cpp -o $(BUILDDIR)/cluster.o



#$(BUILDDIR)/clu_subs.o:

#	$(CXX) $(CXXFLAGS) -c ../libnptm/clu_subs.cpp -o $(BUILDDIR)/clu_subs.o



#$(BUILDDIR)/sph_subs.o:

#	$(CXX) $(CXXFLAGS) -c ../libnptm/sph_subs.cpp -o $(BUILDDIR)/sph_subs.o

$(BUILDDIR)/np_cluster: $(CXX_CLU_OBJS)

	$(CXX) $(CXXFLAGS) -o $(BUILDDIR)/np_cluster $(CXX_CLU_OBJS) $(CXXLDFLAGS) 



clean:

	rm -f $(BUILDDIR)/*.o

	rm -f $(F_CLU_OBJS) $(CXX_CLU_OBJS)



wipe:

	rm -f $(BUILDDIR)/clu $(BUILDDIR)/edfb_clu $(BUILDDIR)/*.o

	rm -f $(BUILDDIR)/clu $(BUILDDIR)/edfb_clu $(F_CLU_OBJS) $(CXX_CLU_OBJS)

src/make.inc

+9 −6
Original line number Diff line number Diff line
@@ -41,13 +41,16 @@ override CXXLDFLAGS=-L/usr/lib64 -L$(HDF5_LIB) -lhdf5 $(LDFLAGS) 
endif



%.o : %.f

	$(FC) $(FCFLAGS) -c -o $(BUILDDIR)/$@ $<

	$(FC) $(FCFLAGS) -c -o $@ $<



%.o : %.cpp

	$(CXX) $(CXXFLAGS) -c -o $(BUILDDIR)/$@ $<

	$(CXX) $(CXXFLAGS) -c -o $@ $<



$(BUILDDIR)/%.o : %.cpp

	$(CXX) $(CXXFLAGS) -c -o $(BUILDDIR)/$@ $<

$(OBJDIR)/%.o : %.f

	$(FC) $(FCFLAGS) -c -o $@ $<



$(BUILDDIR)/%.o : ../libnptm/%.cpp

	$(CXX) $(CXXFLAGS) -c -o $(BUILDDIR)/$@ ../libnptm/$<
 
$(OBJDIR)/%.o : %.cpp

	$(CXX) $(CXXFLAGS) -c -o $@ $<



$(OBJDIR)/%.o : ../libnptm/%.cpp

	$(CXX) $(CXXFLAGS) -c -o $@ $<

src/objects/.gitkeep

0 → 100644
+0 −0

Empty file added.