ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libBASS/Makefile.in
(Generate patch)

Comparing trunk/OOPSE/libBASS/Makefile.in (file contents):
Revision 747 by gezelter, Fri Sep 5 21:28:52 2003 UTC vs.
Revision 846 by mmeineke, Fri Oct 31 18:28:27 2003 UTC

# Line 67 | Line 67 | CXXFLAGS_C=@CXXFLAGS@
67   # C++ flags
68   CXXFLAGS_C=@CXXFLAGS@
69  
70 + # C++ template flags
71 + OOPSE_TEMPLATE_FLAGS=@OOPSE_TEMPLATE_FLAGS@
72 +
73 + # C++ namespace flags
74 + EXTRA_CC_FLAG=@EXTRA_CC_FLAG@
75 +
76 +
77   #######################################################################
78  
79   # First do compile-time flags:
# Line 79 | Line 86 | CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
86   MPI_INCLUDES= -I$(MPI_INC)  
87  
88   CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARES)
89 < CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
89 > CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARES)
90   DEPFLAGS=$(CFLAGS_C)
91  
92   MPI_CFLAGS=$(CFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
# Line 87 | Line 94 | SRC_DIR := $(PWD)
94  
95   # Then do the compile rules:
96  
97 < SRC_DIR := $(PWD)
97 > SRC_DIR := ..
98  
99   obj/%.o: %.cpp
100          cd obj; $(CXX) $(CXXFLAGS) -c $(SRC_DIR)/$<
# Line 182 | Line 189 | distclean : dummy
189          for i in $(LIBSUBDIRS); do \
190            (cd $$i; $(RM) *.o) || exit 1; \
191          done
192 <        $(RM) libBASS.a libBASS_MPI.a *.o *~ Make.dep Make.temp
192 >        $(RM) libBASS.a libBASS_MPI.a *.o *~ Make.temp
193          $(RM) BASSyacc.h BASSyacc.c BASSlex.c
194  
195   Make.dep : $(C_SRCS) $(CXX_SRCS) BASSyacc.h BASSyacc.c BASSlex.c

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines