Changeset 1915


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


Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r1899 r1915  
    4343        @if ( test ! -d $(PYDIR)/asap ) ; then mkdir -p $(PYDIR)/asap ; fi
    4444        @if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
     45        @cd $(ASAPROOT)/$(ATNFD); make install
     46        @cd $(ASAPROOT)/$(PYRAPD); make install
    4547        @for file in $(LIBS) ; do cp -f $$file $(PYDIR)/asap ; done
    4648        @for file in $(BINS) ; do cp -f $$file $(PREFIX)/bin ; done
    4749        @for file in $(PY) ; do cp -f $$file $(PYDIR)/asap ; done
    48         @for file in $(APPS) ; do cp -f $$file $(PREFIX)/bin ; done
    4950        @if ( test ! -d $(PREFIX)/share/asap ) ; then mkdir -p $(PREFIX)/share/asap ; fi
    5051        @cp -f share/ipythonrc-asap $(PREFIX)/share/asap/
    51         @cd $(ASAPROOT)/$(PYRAPD); make install
    52         @cd $(ASAPROOT)/$(ATNFD); make install
     52        @for file in $(APPS) ; do cp -f $$file $(PREFIX)/bin ; done
    5353        @echo "Successfully installed asap module to" $(PYDIR)
    5454
  • 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
  • trunk/external-alma/Makefile

    r1898 r1915  
    4040CXXFLAGS += -fPIC
    4141
    42 # casacore library dependencies
    43 CORELIBS := -lcasa_casa -lcasa_measures -lcasa_scimath -lcasa_ms -lcasa_tables
    44 
    4542# cfitsio
    4643CFITSIOLIB := -lcfitsio
     
    5855
    5956INCDIRS   := -I$(COREINCD) -I$(CFITSIOINCD) -I$(EXTDIR)
    60 LIBS      := -L$(CFITSIOLIBD) $(CFITSIOLIB) -L$(RPFITSLIBD) $(RPFITSLIB) -L$(CASALIB) $(CORELIBS) -lgfortran
     57LIBS      := -L$(CFITSIOLIBD) $(CFITSIOLIB) -L$(RPFITSLIBD) $(RPFITSLIB) -L$(CASALIB) $(CORELIB) -lgfortran
    6158
    6259OBJECTS := $(ATNFDIR)/pks/pks_maths.o \
  • trunk/external/libpyrap/Makefile

    r1911 r1915  
    1919ifeq ($(shell uname), Darwin)
    2020   TARGET := libpyrap.dylib
    21    TESTMOD := $(TESTDIR)/_tConvert.dylib
     21   TESTMOD := $(TESTDIR)/_tConvert.so
    2222else
    2323   TARGET := libpyrap.so
     
    4040# python
    4141PYTHONROOT := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONROOT eval_vars) && echo $$PYTHONROOT)
    42 PYTHONINCD := $(PYTHONROOT)/include/python2.5
     42PYTHONINCD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONINCD eval_vars) && echo $$PYTHONINCD)
    4343PYTHONLIBD := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIBD eval_vars) && echo $$PYTHONLIBD)
    4444PYTHONLIB := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=PYTHONLIB eval_vars) && echo $$PYTHONLIB)
    4545
    4646# numpy (use numpy in CASA)
    47 NUMPYROOT := $(PYTHONLIBD)/python2.5/site-packages/numpy
    48 NUMPYINCD := $(NUMPYROOT)/core/include
     47#NUMPYROOT := $(PYTHONLIBD)/python2.5/site-packages/numpy
     48#NUMPYINCD := $(NUMPYROOT)/core/include
    4949
    5050# the compiler
     
    6868
    6969# include directories
    70 INCDIRS := -I$(COREINCD) -I$(BOOSTINCD) -I$(NUMPYINCD) \
    71            -I$(PYRAPROOT) -I$(PYTHONINCD)
     70INCDIRS := -I$(COREINCD) -I$(BOOSTINCD) \
     71           -I$(PYRAPROOT) $(addprefix -I, $(PYTHONINCD))
    7272
    7373# link option
    74 LDFLAGS := -shared
     74LDFLAGS := $(shell $(shell make -s -f $(CASAROOT)/$(CASAARCH)/makedefs VARS=LD_FLAGS eval_vars) && echo $$LD_FLAGS)
     75LDFLAGS += -shared
    7576
    7677OBJECTS := $(PYRAPDIR)/PycArray.o \
  • trunk/src/Makefile

    r1906 r1915  
    4444
    4545# compiler flags
    46 CXXFLAGS += -fPIC
    47 CXXOPTS += -DHAVE_LIBPYRAP
    48 
    49 CFITSIOLIB := -lcfitsio
    50 
    51 #rpfits
    52 RPFITSLIB := -lrpfits
    53 
    54 G2CROOT := /usr
    55 G2CLIB := -lgfortran
    56 
    57 # pyrap
     46CXXFLAGS += -fPIC -DHAVE_LIBPYRAP
     47
    5848PYRAPD := $(ASAPROOT)/external/libpyrap
    5949PYRAPLIBD := $(PYRAPD)
     
    6151PYRAPLIB := -L$(PYRAPLIBD) -lpyrap
    6252
     53
     54CFITSIOLIB := -lcfitsio
     55
     56#rpfits
     57RPFITSLIB := -lrpfits
     58
     59G2CROOT := /usr
     60G2CLIB := -lgfortran
     61
    6362# links to external libraries
    64 CASAPPLIB := -L$(ASAPROOT)/$(ATNFD) -latnf $(CORELIB) $(PYRAPLIB) \
     63CASAPPLIB := -L$(ASAPROOT)/$(ATNFD) -latnf $(CORELIB) $(PYRAPLIB)\
    6564             -L$(WCSLIBLIBD) $(WCSLIBLIB) \
    6665             -L$(RPFITSLIBD) $(RPFITSLIB) $(CFITSIOLIB) $(G2CLIB) -lstdc++
     
    8382
    8483# DO NOT MODIFY AFTER THIS
    85 INCDIRS   := -I. $(CASAINC)  -I$(CFITSIOINCD) $(BOOSTINC) -I$(PYTHONINCD) -I$(ASAPROOT)/$(ATNFD) -I$(PYRAPINCD)
     84INCDIRS   := -I. $(CASAINC)  -I$(CFITSIOINCD) $(BOOSTINC) $(addprefix -I, $(PYTHONINCD)) -I$(ASAPROOT)/$(ATNFD) -I$(PYRAPINCD)
    8685LIBS      := $(PYTHONLIB)  $(BOOSTLIB) $(CASAPPLIB)
    8786
Note: See TracChangeset for help on using the changeset viewer.