Changeset 818

Timestamp:

02/16/06 12:16:52 (18 years ago)

Author:

mar637

Message:

SDTemplates -> STTemplates

File:

• trunk/src/Makefile (modified) (6 diffs)

trunk/src/Makefile

@@ -41 +41 @@
 CASAPPLIB := $(CASALIB)/version.o \
              -L$(CASALIB) \
-             -latnf -limages -lms -lcomponents -lcoordinates \
-             -llattices -lfits -lmeasures -lmeasures_f \
-             -ltables -lscimath -lscimath_f -lcasa  \
-             $(CASALIB)/libwcs.a \
-             $(RPFITSLIB) $(CFITSIOLIB) -lg2c -lstdc++
+             -latnf -limages -lms -lcomponents -lcoordinates \
+             -llattices -lfits -lmeasures -lmeasures_f \
+             -ltables -lscimath -lscimath_f -lcasa  \
+             $(CASALIB)/libwcs.a \
+             $(RPFITSLIB) $(CFITSIOLIB) -lg2c -lstdc++
 
 # darwin specific CASA flags
@@ -66 +66 @@
 PYTHONROOT := /usr
 PYTHONINC := -I$(PYTHONROOT)/include/python$(PYVERSION)
-PYTHONLIB := -L$(PYTHONROOT)/lib -lpython$(PYVERSION) 
+PYTHONLIB := -L$(PYTHONROOT)/lib -lpython$(PYVERSION)
 
 # has to be build with same g++ version as casa
@@ -80 +80 @@
 CCOBJECTS := MathUtils.o \
              MathUtils2.o \
-             SDLog.o \
+             SDLog.o \
              SDAttr.o \
              SDContainer.o \
              Scantable.o \
-             ScantableFiller.o \
-             SDTemplates.o \
-             STMath.o \
-             STSubTable.o \
-             STMolecules.o \
-             STTcal.o \
-             STFocus.o \
-             STWeather.o \
-             STFrequencies.o \
-             RowAccumulator.o \
-             STSelector.o 
-PYOBJECTS := 
+             STFiller.o \
+             STTemplates.o \
+             STMath.o \
+             STSubTable.o \
+             STMolecules.o \
+             STTcal.o \
+             STFocus.o \
+             STWeather.o \
+             STFrequencies.o \
+             RowAccumulator.o \
+             STSelector.o
+PYOBJECTS :=
 
 OBJECTS := $(CCOBJECTS) $(PYOBJECTS)
 
 HEADERS   := MathUtils.h \
-             SDLog.h \
+             SDLog.h \
              SDAttr.h \
              SDContainer.h \
              Scantable.h \
-             ScantableFiller.h \
-             STMath.h \
-             RowAccumulator.h \
-             STSubTable.h \
-             STMolecules.h \
-             STTcal.h \
-             STFocus.h \
-             STWeather.h \
-             STFrequencies.h \
-             SDDefs.h \
-             STSelector.h
+             STFiller.h \
+             STMath.h \
+             RowAccumulator.h \
+             STSubTable.h \
+             STMolecules.h \
+             STTcal.h \
+             STFocus.h \
+             STWeather.h \
+             STFrequencies.h \
+             SDDefs.h \
+             STSelector.h
 
 STATICCCLIB := libasap.a
@@ -123 +123 @@
 .cpp.o:
         -@ echo
-           $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
+          $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
 
 .cc.o:
         -@ echo
-           $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
+          $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
 
 .cxx.o:
         -@ echo
-           $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
+          $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
 
 .C.o:
         -@ echo
-           $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
+          $(CXX) $(CXXOPTS) -c $(CXXFLAGS) $(INCDIRS) -o $@ $<
 
 
@@ -148 +148 @@
 $(TARGET) : $(OBJECTS)
         -@ echo
-           $(LD) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
+          $(LD) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
 
 $(OBJECTS) : $(HEADERS)
@@ -164 +164 @@
 test: tFiller.o objects
         -@ echo
-           $(LD) -g -o /tmp/tFiller $(OBJECTS) $(LIBS) tFiller.o
+          $(LD) -g -o /tmp/tFiller $(OBJECTS) $(LIBS) tFiller.o