--- trunk/OOPSE/libBASS/Makefile.in	2003/09/05 21:28:52	747
+++ trunk/OOPSE/libBASS/Makefile.in	2003/10/31 18:28:27	846
@@ -67,6 +67,13 @@ CXXFLAGS_C=@CXXFLAGS@
 # C++ flags
 CXXFLAGS_C=@CXXFLAGS@
 
+# C++ template flags
+OOPSE_TEMPLATE_FLAGS=@OOPSE_TEMPLATE_FLAGS@
+
+# C++ namespace flags
+EXTRA_CC_FLAG=@EXTRA_CC_FLAG@
+
+
 #######################################################################
 
 # First do compile-time flags:
@@ -79,7 +86,7 @@ CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
 MPI_INCLUDES= -I$(MPI_INC)  
 
 CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARES)
-CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
+CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARES)
 DEPFLAGS=$(CFLAGS_C)
 
 MPI_CFLAGS=$(CFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
@@ -87,7 +94,7 @@ SRC_DIR := $(PWD)
 
 # Then do the compile rules:
 
-SRC_DIR := $(PWD)
+SRC_DIR := ..
 
 obj/%.o: %.cpp
 	cd obj; $(CXX) $(CXXFLAGS) -c $(SRC_DIR)/$<
@@ -182,7 +189,7 @@ distclean : dummy
 	for i in $(LIBSUBDIRS); do \
 	  (cd $$i; $(RM) *.o) || exit 1; \
 	done
-	$(RM) libBASS.a libBASS_MPI.a *.o *~ Make.dep Make.temp 
+	$(RM) libBASS.a libBASS_MPI.a *.o *~ Make.temp 
 	$(RM) BASSyacc.h BASSyacc.c BASSlex.c
 
 Make.dep : $(C_SRCS) $(CXX_SRCS) BASSyacc.h BASSyacc.c BASSlex.c