Changes in trunk/apps [1819:1941]

Location:

trunk/apps

Files:

• Makefile (modified) (2 diffs)
• asap2to3.cpp (modified) (1 diff)

trunk/apps/Makefile

@@ -8 +8 @@
 CASAARCH  := $(word 2, $(CASAPATH))
 
+CORELIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=CORELIB eval_vars) && echo $$CORELIB)
 COREINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=COREINCD eval_vars) && echo $$COREINCD)
 CASALIB   := $(CASAROOT)/$(CASAARCH)/lib
@@ -17 +18 @@
 
 # compiler flags
-CXXFLAGS := -fPIC -O3 -g
-CXXFLAGS += -ansi -Wno-long-long -Wall
-CXXFLAGS := -Xlinker -rpath -Xlinker $(CASALIB)
+CXXFLAGS := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=CXXFLAGS eval_vars) && echo $$CXXFLAGS)
+CXXFLAGS += -fPIC -O3 -Xlinker -rpath -Xlinker $(CASALIB)
 
 
 INCDIRS   := -I$(COREINCD)
-LIBS      := -L$(CASALIB) -lcasa_tables -lcasa_casa
+LIBS      := -L$(CASALIB) $(CORELIB)
 
 OBJECTS := asap2to3 

trunk/apps/asap2to3.cpp

@@ -29 +29 @@
   Int verid=tab.rwKeywordSet().fieldNumber("VERSION");
   tab.rwKeywordSet().define(verid,uInt(3));
+  tab.tableInfo().setType("Scantable");
   cout << "WARNING: This has invalidated the parallactic angle in the data. Reprocess the data in ASAP 3 "
        << "if you need to handle polarisation conversions"