Tweaked Makefile to link to required libs/modules

src/NEST/Makefile

@@ -2,32 +2,44 @@
 
 NAME=stitch_nest
 include ../Makefile.inc
-INCLUDE=-I/home/dwhipp/software/DOUARW/douar_newiso/src
+INCLUDE=-I.. $(MPI_INC)
 BIN=$(NAME)$(BITS)
 
 # object (combines velocity/temperature/cloud fields and update surface positions)
 
 OBJECTS = \
 ../module_definitions.o \
+../module_random.o \
 ../module_threads.o \
+../compute_normals.o \
+../create_surfaces.o \
 ../define_cloud.o \
 ../define_ov.o \
 ../define_surface.o \
 ../heap.o \
+../initialize_temperature.o \
+../octreev_shrink_xyz.o \
 ../read_controlling_parameters.o \
 ../read_input_file.o \
+../scanfile.o \
 stitch_nest.o \
 ../toolbox.o
 
-OCTREE = ../OCTREE/libOctree$(BITS).a
+#OCTREE = ../OCTREE/libOctree$(BITS).a
+
+LIBS = \
+ -L../OCTREE -lOctree$(BITS) \
+ -L../NN -lnn_f$(BITS) \
+ -L../NN -lnn_c$(BITS) \
+ $(MPI_LIB)
 
 # make the program
 #
 all: $(BIN)
 $(BIN): $(OBJECTS)
-	@echo "$(F90) $(FFLAGS) $(INCLUDE) $(MPI_LIB) $(OPTIONS) $(OBJECTS) -o $(BIN)" \
+	@echo "$(F90) $(FFLAGS) $(INCLUDE) $(OPTIONS) $(OBJECTS) $(LIBS) -o $(BIN)" \
 1>>$(BIN).link.stdout 2>>$(BIN).link.stderr
-	$(F90) $(FFLAGS) $(INCLUDE) $(MPI_LIB) $(OPTIONS) $(OBJECTS) $(OCTREE) -o $(BIN) \
+	$(F90) $(FFLAGS) $(INCLUDE) $(OPTIONS) $(OBJECTS) $(OCTREE) $(LIBS) -o $(BIN) \
 1>>$(BIN).link.stdout 2>>$(BIN).link.stderr
 
 .PHONY: objclean