Changeset 1730 in Sophya


Ignore:
Timestamp:
Nov 5, 2001, 11:42:37 AM (24 years ago)
Author:
aubourg
Message:

pour config linux CDF

Location:
trunk/ArchTOIPipe
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/ArchTOIPipe/Kernel/Makefile.in

    r1707 r1730  
    1818
    1919ifeq ($(USE_SOPHYA),1)
    20  include $(DPCDEVREP)/Include/Makefile.h
     20 include $(DPCBASEREP)/Include/MakefileUser.h
    2121
    2222 ifdef NOSHLIB
    23   LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a $(LIB)libPI.a $(LIB)libPIext.a
    24   LIBS = -L$(LIB) -lPIext -lPI -lSysTools -lNTools -lBlitz  -lm
     23  LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a
     24  LIBS = -L$(LIB) -lSysTools -lNTools -lBlitz  -lm
    2525  ifeq ($(CXX),cxx)
    2626   # librairie des instances de templates cxx
    … …  
    2929 else
    3030  LIBF =  $(SLB)libsophya.so
    31   LIBS = -L$(SLB) -lPI -lextsophya -lsophya -lm
     31  LIBS = -L$(SLB) -lextsophya -lsophya -lm
    3232  ifeq ($(MACHEROS),OSF1)
    3333   LIBS := $(LIBS) -lfor
    3434  endif
    3535  ifeq ($(MACHEROS),Linux)
    36    LIBS := $(LIBS) -ldl -lf2c
     36#   LIBS := $(LIBS) -ldl -lf2c
    3737  endif
    3838 endif
    3939 
    40  CPPFLAGS := -DWITH_SOPHYA $(CPPFLAGS)
     40  CPPFLAGS := -DWITH_SOPHYA $(CPPFLAGS)
    4141 ifeq ($(CXX), cxx)
    4242   LIBS := $(LIBS) -pthread
     43 endif
     44 ifeq ($(MACHEROS),Linux)
     45   LIBS := $(LIBS) -lpthread
    4346 endif
    4447else
    … …  
    4649  CXXFLAGS := -O -g -D__USE_STD_IOSTREAM
    4750  LIBS := $(LIBS) -pthread
     51 endif
     52 ifeq ($(MACHEROS),Linux)
     53   LIBS := $(LIBS) -lpthread
    4854 endif
    4955endif

  • trunk/ArchTOIPipe/Makefile.in

    r1706 r1730  
    1717
    1818ifeq ($(USE_SOPHYA),1)
    19  include $(DPCDEVREP)/Include/Makefile.h
     19 include $(DPCBASEREP)/Include/MakefileUser.h
    2020
    2121 ifdef NOSHLIB
    22   LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a $(LIB)libPI.a $(LIB)libPIext.a
    23   LIBS := -L$(LIB) -lPIext -lPI -lSysTools -lNTools -lBlitz  -lm
     22  LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a
     23  LIBS := -L$(LIB) -lSysTools -lNTools -lBlitz  -lm
    2424  ifeq ($(CXX),cxx)
    2525   # librairie des instances de templates cxx
    … …  
    2828 else
    2929  LIBF =  $(SLB)libsophya.so
    30   LIBS := -L$(SLB) -lPI -lextsophya -lsophya -lm
     30  LIBS := -L$(SLB) -lextsophya -lsophya -lm
    3131  ifeq ($(MACHEROS),OSF1)
    3232   LIBS := $(LIBS) -lfor
    3333  endif
    3434  ifeq ($(MACHEROS),Linux)
    35    LIBS := $(LIBS) -ldl -lf2c
     35#   LIBS := $(LIBS) -ldl -lf2c
    3636  endif
    3737 endif

  • trunk/ArchTOIPipe/ProcWSophya/Makefile.in

    r1722 r1730  
    1818
    1919ifeq ($(USE_SOPHYA),1)
    20  include $(DPCDEVREP)/Include/Makefile.h
     20 include $(DPCBASEREP)/Include/MakefileUser.h
    2121
    2222 ifdef NOSHLIB
    23   LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a $(LIB)libPI.a $(LIB)libPIext.a
    24   LIBS = -L$(LIB) -lPIext -lPI -lSysTools -lNTools -lBlitz  -lm
     23  LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a
     24  LIBS = -L$(LIB) -lSysTools -lNTools -lBlitz  -lm
    2525  ifeq ($(CXX),cxx)
    2626   # librairie des instances de templates cxx
    … …  
    2929 else
    3030  LIBF =  $(SLB)libsophya.so
    31   LIBS = -L$(SLB) -lPI -lextsophya -lsophya -lm
     31  LIBS = -L$(SLB) -lextsophya -lsophya -lm
    3232  ifeq ($(MACHEROS),OSF1)
    3333   LIBS := $(LIBS) -lfor
    3434  endif
    3535  ifeq ($(MACHEROS),Linux)
    36    LIBS := $(LIBS) -ldl -lf2c
     36#   LIBS := $(LIBS) -ldl -lf2c
    3737  endif
    3838 endif
    … …  
    4242   LIBS := $(LIBS) -pthread
    4343 endif
     44 ifeq ($(MACHEROS),Linux)
     45   LIBS := $(LIBS) -lpthread
     46 endif
    4447else
    4548 ifeq ($(CXX), cxx)
    4649  CXXFLAGS := -O -g -D__USE_STD_IOSTREAM
    4750  LIBS := $(LIBS) -pthread
     51 endif
     52 ifeq ($(MACHEROS),Linux)
     53   LIBS := $(LIBS) -lpthread
    4854 endif
    4955endif

  • trunk/ArchTOIPipe/Processors/Makefile.in

    r1707 r1730  
    1818
    1919ifeq ($(USE_SOPHYA),1)
    20  include $(DPCDEVREP)/Include/Makefile.h
     20 include $(DPCBASEREP)/Include/MakefileUser.h
    2121
    2222 ifdef NOSHLIB
    23   LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a $(LIB)libPI.a $(LIB)libPIext.a
    24   LIBS = -L$(LIB) -lPIext -lPI -lSysTools -lNTools -lBlitz  -lm
     23  LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a
     24  LIBS = -L$(LIB) -lSysTools -lNTools -lBlitz  -lm
    2525  ifeq ($(CXX),cxx)
    2626   # librairie des instances de templates cxx
    … …  
    2929 else
    3030  LIBF =  $(SLB)libsophya.so
    31   LIBS = -L$(SLB) -lPI -lextsophya -lsophya -lm
     31  LIBS = -L$(SLB) -lextsophya -lsophya -lm
    3232  ifeq ($(MACHEROS),OSF1)
    3333   LIBS := $(LIBS) -lfor
    3434  endif
    3535  ifeq ($(MACHEROS),Linux)
    36    LIBS := $(LIBS) -ldl -lf2c
     36#   LIBS := $(LIBS) -ldl -lf2c
    3737  endif
    3838 endif
    … …  
    4242   LIBS := $(LIBS) -pthread
    4343 endif
     44 ifeq ($(MACHEROS),Linux)
     45   LIBS := $(LIBS) -lpthread
     46 endif
    4447else
    4548 ifeq ($(CXX), cxx)
    4649  CXXFLAGS := -O -g -D__USE_STD_IOSTREAM
    4750  LIBS := $(LIBS) -pthread
     51 endif
     52 ifeq ($(MACHEROS),Linux)
     53   LIBS := $(LIBS) -lpthread
    4854 endif
    4955endif

  • trunk/ArchTOIPipe/TestPipes/Makefile.in

    r1707 r1730  
    1818
    1919ifeq ($(USE_SOPHYA),1)
    20  include $(DPCDEVREP)/Include/Makefile.h
     20 include $(DPCBASEREP)/Include/MakefileUser.h
    2121
    2222 ifdef NOSHLIB
    23   LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a $(LIB)libPI.a $(LIB)libPIext.a
    24   LIBS := -L$(LIB) -lPIext -lPI -lSysTools -lNTools -lBlitz  -lm
     23  LIBF =  $(LIB)libSysTools.a $(LIB)libNTools.a $(LIB)libBlitz.a $(LIB)libFitsIOServer.a
     24  LIBS := -L$(LIB) -lSysTools -lNTools -lBlitz  -lm
    2525  ifeq ($(CXX),cxx)
    2626   # librairie des instances de templates cxx
    … …  
    2929 else
    3030  LIBF =  $(SLB)libsophya.so
    31   LIBS := -L$(SLB) -lPI -lextsophya -lsophya -lm
     31  LIBS := -L$(SLB) -lextsophya -lsophya -lm
    3232  ifeq ($(MACHEROS),OSF1)
    3333   LIBS := $(LIBS) -lfor
    3434  endif
    3535  ifeq ($(MACHEROS),Linux)
    36    LIBS := $(LIBS) -ldl -lf2c
     36#   LIBS := $(LIBS) -ldl -lf2c
    3737  endif
    3838 endif
    … …  
    4242   LIBS := $(LIBS) -pthread
    4343 endif
     44 ifeq ($(MACHEROS),Linux)
     45   LIBS := $(LIBS) -lpthread
     46 endif
    4447else
    4548 ifeq ($(CXX), cxx)
    4649  CXXFLAGS := -O -g -D__USE_STD_IOSTREAM
    4750  LIBS := $(LIBS) -pthread
     51 endif
     52 ifeq ($(MACHEROS),Linux)
     53   LIBS := $(LIBS) -lpthread
    4854 endif
    4955endif

  • trunk/ArchTOIPipe/configure

    r1707 r1730  
    12701270if test -f $ARCHBASEREP/$MACHDIR/Libs/libcfitsio.a; then
    12711271  cfitslibdir='-L$(ARCHBASEREP)/$(MACHDIR)/Libs'
     1272elif test -f $EXTLIBDIR/$MACHDIR/Libs/libcfitsio.a; then
     1273  cfitslibdir='-L$(EXTLIBDIR)/$(MACHDIR)/Libs'
    12721274elif test -f $CFITSIOLIBDIR/$MACHDIR/Libs/libcfitsio.a; then
    12731275  cfitslibdir='-L$(CFITSIOLIBDIR)/$(MACHDIR)/Libs'
    … …  
    12911293
    12921294echo $ac_n "checking "for cfitsio includes"""... $ac_c" 1>&6
    1293 echo "configure:1294: checking "for cfitsio includes"" >&5
     1295echo "configure:1296: checking "for cfitsio includes"" >&5
    12941296if test -f $CFITSIODIR/fitsio.h; then
    12951297  cfitsincdir='-I$(CFITSIODIR)'
     1298elif test -f $EXTLIBDIR/Include/FitsIO/fitsio.h; then
     1299  cfitsincdir='-I$(EXTLIBDIR)/Include/FitsIO/fitsio.h'
    12961300elif test -f /usr/local/include/fitsio.h; then
    12971301  cfitsincdir=""
    … …  
    13031307
    13041308echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
    1305 echo "configure:1306: checking for sin in -lm" >&5
     1309echo "configure:1310: checking for sin in -lm" >&5
    13061310ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
    13071311if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    … …  
    13111315LIBS="-lm  $LIBS"
    13121316cat > conftest.$ac_ext <<EOF
    1313 #line 1314 "configure"
     1317#line 1318 "configure"
    13141318#include "confdefs.h"
    13151319/* Override any gcc2 internal prototype to avoid an error.  */
    … …  
    13221326; return 0; }
    13231327EOF
    1324 if { (eval echo configure:1325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
     1328if { (eval echo configure:1329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    13251329  rm -rf conftest*
    13261330  eval "ac_cv_lib_$ac_lib_var=yes"
    … …  
    13511355
    13521356echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
    1353 echo "configure:1354: checking how to run the C preprocessor" >&5
     1357echo "configure:1358: checking how to run the C preprocessor" >&5
    13541358# On Suns, sometimes $CPP names a directory.
    13551359if test -n "$CPP" && test -d "$CPP"; then
    … …  
    13661370  # not just through cpp.
    13671371  cat > conftest.$ac_ext <<EOF
    1368 #line 1369 "configure"
     1372#line 1373 "configure"
    13691373#include "confdefs.h"
    13701374#include <assert.h>
    … …  
    13721376EOF
    13731377ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1374 { (eval echo configure:1375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1378{ (eval echo configure:1379: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    13751379ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    13761380if test -z "$ac_err"; then
    … …  
    13831387  CPP="${CC-cc} -E -traditional-cpp"
    13841388  cat > conftest.$ac_ext <<EOF
    1385 #line 1386 "configure"
     1389#line 1390 "configure"
    13861390#include "confdefs.h"
    13871391#include <assert.h>
    … …  
    13891393EOF
    13901394ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1391 { (eval echo configure:1392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1395{ (eval echo configure:1396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    13921396ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    13931397if test -z "$ac_err"; then
    … …  
    14001404  CPP="${CC-cc} -nologo -E"
    14011405  cat > conftest.$ac_ext <<EOF
    1402 #line 1403 "configure"
     1406#line 1407 "configure"
    14031407#include "confdefs.h"
    14041408#include <assert.h>
    … …  
    14061410EOF
    14071411ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1408 { (eval echo configure:1409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1412{ (eval echo configure:1413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    14091413ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    14101414if test -z "$ac_err"; then
    … …  
    14311435
    14321436echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
    1433 echo "configure:1434: checking for ANSI C header files" >&5
     1437echo "configure:1438: checking for ANSI C header files" >&5
    14341438if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    14351439  echo $ac_n "(cached) $ac_c" 1>&6
    14361440else
    14371441  cat > conftest.$ac_ext <<EOF
    1438 #line 1439 "configure"
     1442#line 1443 "configure"
    14391443#include "confdefs.h"
    14401444#include <stdlib.h>
    … …  
    14441448EOF
    14451449ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1446 { (eval echo configure:1447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1450{ (eval echo configure:1451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    14471451ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    14481452if test -z "$ac_err"; then
    … …  
    14611465  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
    14621466cat > conftest.$ac_ext <<EOF
    1463 #line 1464 "configure"
     1467#line 1468 "configure"
    14641468#include "confdefs.h"
    14651469#include <string.h>
    … …  
    14791483  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
    14801484cat > conftest.$ac_ext <<EOF
    1481 #line 1482 "configure"
     1485#line 1486 "configure"
    14821486#include "confdefs.h"
    14831487#include <stdlib.h>
    … …  
    15001504else
    15011505  cat > conftest.$ac_ext <<EOF
    1502 #line 1503 "configure"
     1506#line 1507 "configure"
    15031507#include "confdefs.h"
    15041508#include <ctype.h>
    … …  
    15111515
    15121516EOF
    1513 if { (eval echo configure:1514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     1517if { (eval echo configure:1518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
    15141518then
    15151519  :
    … …  
    15381542ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
    15391543echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
    1540 echo "configure:1541: checking for $ac_hdr" >&5
     1544echo "configure:1545: checking for $ac_hdr" >&5
    15411545if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    15421546  echo $ac_n "(cached) $ac_c" 1>&6
    15431547else
    15441548  cat > conftest.$ac_ext <<EOF
    1545 #line 1546 "configure"
     1549#line 1550 "configure"
    15461550#include "confdefs.h"
    15471551#include <$ac_hdr>
    15481552EOF
    15491553ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
    1550 { (eval echo configure:1551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
     1554{ (eval echo configure:1555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
    15511555ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
    15521556if test -z "$ac_err"; then

  • trunk/ArchTOIPipe/configure.in

    r1707 r1730  
    4343if test -f $ARCHBASEREP/$MACHDIR/Libs/libcfitsio.a; then
    4444  cfitslibdir='-L$(ARCHBASEREP)/$(MACHDIR)/Libs'
     45elif test -f $EXTLIBDIR/$MACHDIR/Libs/libcfitsio.a; then
     46  cfitslibdir='-L$(EXTLIBDIR)/$(MACHDIR)/Libs'
    4547elif test -f $CFITSIOLIBDIR/$MACHDIR/Libs/libcfitsio.a; then
    4648  cfitslibdir='-L$(CFITSIOLIBDIR)/$(MACHDIR)/Libs'
    … …  
    6668if test -f $CFITSIODIR/fitsio.h; then
    6769  cfitsincdir='-I$(CFITSIODIR)'
     70elif test -f $EXTLIBDIR/Include/FitsIO/fitsio.h; then
     71  cfitsincdir='-I$(EXTLIBDIR)/Include/FitsIO/fitsio.h'
    6872elif test -f /usr/local/include/fitsio.h; then
    6973  cfitsincdir=""

  • trunk/ArchTOIPipe/fan_copy

    r1710 r1730  
    44  echo ""
    55  echo "****" $d
     6  mkdir -p $d
    67  foreach f (`cat files_$d`)
    78   echo $f
Note: See TracChangeset for help on using the changeset viewer.