Changeset 1915 for trunk/apps


Ignore:
Timestamp:
08/30/10 15:13:13 (14 years ago)
Author:
Kana Sugimoto
Message:

New Development: No

JIRA Issue: No (related to merge)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: make & make install

Put in Release Notes: No

Module(s): asap

Description: merged Wes's changes to Makefiles


File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/apps/Makefile

    r1819 r1915  
    88CASAARCH  := $(word 2, $(CASAPATH))
    99
     10CORELIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=CORELIB eval_vars) && echo $$CORELIB)
    1011COREINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=COREINCD eval_vars) && echo $$COREINCD)
    1112CASALIB   := $(CASAROOT)/$(CASAARCH)/lib
    … …  
    1718
    1819# compiler flags
    19 CXXFLAGS := -fPIC -O3 -g
    20 CXXFLAGS += -ansi -Wno-long-long -Wall
    21 CXXFLAGS := -Xlinker -rpath -Xlinker $(CASALIB)
     20CXXFLAGS := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=CXXFLAGS eval_vars) && echo $$CXXFLAGS)
     21CXXFLAGS += -fPIC -O3 -Xlinker -rpath -Xlinker $(CASALIB)
    2222
    2323
    2424INCDIRS   := -I$(COREINCD)
    25 LIBS      := -L$(CASALIB) -lcasa_tables -lcasa_casa
     25LIBS      := -L$(CASALIB) $(CORELIB)
    2626
    2727OBJECTS := asap2to3
Note: See TracChangeset for help on using the changeset viewer.