Changeset 455


Ignore:
Timestamp:
Aug 17, 2005 11:42:30 AM (14 years ago)
Author:
andreasw
Message:
  • made 'make dist' work
  • several changes in configure
Location:
branches/dev
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • branches/dev/Apps/AmplSolver/AmplTNLP.cpp

    r448 r455  
    2929{
    3030  DBG_SET_VERBOSITY(0);
     31
     32#define nullintopt -2682238
     33#define nullrealopt -1.278463e202
     34
     35  static real opTOL = nullrealopt;
     36  // Stuff for AMPL options
     37  static keyword keywds[] =
     38  {
     39    KW("tol"         ,D_val,&opTOL,
     40       "Overall error tolerance (termination criterion)")
     41  } ;
     42
     43  static Option_Info Oinfo = {PACKAGE_NAME,PACKAGE_STRING,
     44                              "ipopt_options",keywds,nkeywds};
     45
    3146
    3247  AmplTNLP::AmplTNLP(const SmartPtr<const Journalist>& jnlst, char**& argv,
     
    641656  }
    642657
     658
     659
     660  void AmplTNLP::GetOptions()
     661  {
     662   
     663  }
     664
    643665  AmplSuffixHandler::AmplSuffixHandler()
    644666      :
     
    752774  }
    753775
    754 
    755776} // namespace Ipopt
    756777
  • branches/dev/Apps/CUTErInterface/CUTErInterface.f

    r433 r455  
    3333C     
    3434C
    35       INTEGER N, M, NLB, NUB
     35      INTEGER N, M
    3636      DOUBLE PRECISION X( CUTE_NMAX )
    3737      DOUBLE PRECISION X_L( CUTE_NMAX )
  • branches/dev/Apps/CUTErInterface/Makefile.am

    r157 r455  
    66
    77AUTOMAKE_OPTIONS = foreign
     8
     9EXTRA_DIST = \
     10        CUTErInterface.f \
     11        ipo.pro \
     12        sdipo.pro
    813
    914noinst_LIBRARIES = libdummy.a
  • branches/dev/Apps/CUTErInterface/Makefile.in

    r438 r455  
    192192target_alias = @target_alias@
    193193AUTOMAKE_OPTIONS = foreign
     194EXTRA_DIST = \
     195        CUTErInterface.f \
     196        ipo.pro \
     197        sdipo.pro
     198
    194199noinst_LIBRARIES = libdummy.a
    195200libdummy_a_SOURCES = ipoma.f
  • branches/dev/Extern/ASL/Makefile.am

    r430 r455  
    66
    77AUTOMAKE_OPTIONS = foreign
     8
     9EXTRA_DIST = get.ASL INSTALL.ASL
    810
    911compdir = compdir
  • branches/dev/Extern/ASL/Makefile.in

    r438 r455  
    177177target_alias = @target_alias@
    178178AUTOMAKE_OPTIONS = foreign
     179EXTRA_DIST = get.ASL INSTALL.ASL
    179180compdir = compdir
    180181libampl = amplsolver.a
  • branches/dev/Extern/HSL/Makefile.am

    r430 r455  
    55## $Id$
    66
     7AUTOMAKE_OPTIONS = foreign
     8
     9EXTRA_DIST = INSTALL.HSL
     10
    711iplibdir = $(top_builddir)/lib
    8 
    9 AUTOMAKE_OPTIONS = foreign
    1012
    1113noinst_LIBRARIES = libiphsl.a
  • branches/dev/Extern/HSL/Makefile.in

    r438 r455  
    195195sysconfdir = @sysconfdir@
    196196target_alias = @target_alias@
     197AUTOMAKE_OPTIONS = foreign
     198EXTRA_DIST = INSTALL.HSL
    197199iplibdir = $(top_builddir)/lib
    198 AUTOMAKE_OPTIONS = foreign
    199200noinst_LIBRARIES = libiphsl.a
    200201nodist_libiphsl_a_SOURCES = $(am__append_1) $(am__append_2)
  • branches/dev/Extern/blas/Makefile.am

    r430 r455  
    1 # Copyright (C) 2003, International Business Machines and others.
     1# Copyright (C) 2003, 2004, 2005 International Business Machines and others.
    22# All Rights Reserved.
    33# This file is distributed under the Common Public License.
     
    66
    77AUTOMAKE_OPTIONS = foreign
     8
     9EXTRA_DIST = get.blas INSTALL.BLAS
    810
    911iplibdir = $(top_builddir)/lib
  • branches/dev/Extern/blas/Makefile.in

    r438 r455  
    246246target_alias = @target_alias@
    247247AUTOMAKE_OPTIONS = foreign
     248EXTRA_DIST = get.blas INSTALL.BLAS
    248249iplibdir = $(top_builddir)/lib
    249250noinst_LIBRARIES = libipblas.a
  • branches/dev/Makefile.am

    r441 r455  
    1313IPALLLIBS = @IPALLLIBS@
    1414
    15 EXTRA_DIST = Examples/Fortran_example/example.f \
     15EXTRA_DIST = \
     16        Examples/Cpp_example/cpp_example.cpp \
     17        Examples/Cpp_example/MyNLP.cpp \
     18        Examples/Cpp_example/MyNLP.hpp \
     19        Examples/Fortran_example/example.f \
     20        Examples/hs071_cpp/hs071_main.cpp \
     21        Examples/hs071_cpp/hs071_nlp.cpp \
     22        Examples/hs071_cpp/hs071_nlp.hpp \
    1623        README \
    1724        Docs/documentation.tex
  • branches/dev/Makefile.in

    r447 r455  
    208208AUTOMAKE_OPTIONS = foreign
    209209SUBDIRS = Extern Common LinAlg Algorithm Interfaces Apps
    210 EXTRA_DIST = Examples/Fortran_example/example.f \
     210EXTRA_DIST = \
     211        Examples/Cpp_example/cpp_example.cpp \
     212        Examples/Cpp_example/MyNLP.cpp \
     213        Examples/Cpp_example/MyNLP.hpp \
     214        Examples/Fortran_example/example.f \
     215        Examples/hs071_cpp/hs071_main.cpp \
     216        Examples/hs071_cpp/hs071_nlp.cpp \
     217        Examples/hs071_cpp/hs071_nlp.hpp \
    211218        README \
    212219        Docs/documentation.tex
  • branches/dev/configure

    r451 r455  
    21382138        add_cxxflags="-pipe"
    21392139        dbg_cxxflags="-g"
    2140         warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Werror -Wconversion"
     2140        warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Werror -Wconversion"
    21412141        case $build in
    21422142          *-cygwin*) echo "$as_me:$LINENO: checking whether flag \" -mno-cygwin\" works" >&5
     
    22862286      esac;;
    22872287    *-sun-*)
    2288              opt_cxxflags="-fast"
     2288             opt_cxxflags="-O5 -xtarget=native"
    22892289             dbg_cxxflags="-g";;
    22902290    esac
     
    32493249             dbg_cflags="-g";;
    32503250    *-sun-*)
    3251              opt_cflags="-fast"
     3251             opt_cflags="-xO5 -xtarget=native"
    32523252             dbg_cflags="-g";;
    32533253    *-sgi-*)
     
    38603860             dbg_fflags="-C -g";;
    38613861    *-sun-*)
    3862              opt_fflags="-fast"
     3862             opt_fflags="-O5 -xtarget=native"
    38633863             dbg_fflags="-g";;
    38643864    *-sgi-*)
     
    95579557    fi
    95589558  fi
    9559   ASLMAKEFILECMDS="sed 's/ar \$\$(ARFLAGS)/$AR \$\$(ARFLAGS)/' makefile.u | sed 's/ar ruv/$AR ruv/' "
     9559  ASLMAKEFILECMDS="sed 's/ar \$\$(ARFLAGS)/$AR $ARFLAGS/' makefile.u | sed 's/ar ruv/$AR $ARFLAGS/' "
    95609560  if test "$EXEEXT" = ".exe"; then
    95619561    ASLMAKEFILECMDS="$ASLMAKEFILECMDS | sed 's/a.out/a.exe/'"
     
    98529852
    98539853
    9854                                                                                                                                                                                     ac_config_files="$ac_config_files Makefile Common/Makefile LinAlg/Makefile LinAlg/TMatrices/Makefile Interfaces/Makefile Algorithm/Makefile Algorithm/LinearSolvers/Makefile Apps/Makefile Apps/AmplSolver/Makefile Apps/CompositeInterface/Makefile Apps/CUTErInterface/Makefile Examples/Fortran_example/Makefile Examples/Cpp_example/Makefile Examples/hs071_cpp/Makefile Extern/Makefile Extern/blas/Makefile Extern/HSL/Makefile Extern/ASL/Makefile"
     9854                                                                                                                                                                          ac_config_files="$ac_config_files Makefile Common/Makefile LinAlg/Makefile LinAlg/TMatrices/Makefile Interfaces/Makefile Algorithm/Makefile Algorithm/LinearSolvers/Makefile Apps/Makefile Apps/AmplSolver/Makefile Apps/CUTErInterface/Makefile Examples/Fortran_example/Makefile Examples/Cpp_example/Makefile Examples/hs071_cpp/Makefile Extern/Makefile Extern/blas/Makefile Extern/HSL/Makefile Extern/ASL/Makefile"
    98559855
    98569856
     
    1050310503  "Apps/Makefile" ) CONFIG_FILES="$CONFIG_FILES Apps/Makefile" ;;
    1050410504  "Apps/AmplSolver/Makefile" ) CONFIG_FILES="$CONFIG_FILES Apps/AmplSolver/Makefile" ;;
    10505   "Apps/CompositeInterface/Makefile" ) CONFIG_FILES="$CONFIG_FILES Apps/CompositeInterface/Makefile" ;;
    1050610505  "Apps/CUTErInterface/Makefile" ) CONFIG_FILES="$CONFIG_FILES Apps/CUTErInterface/Makefile" ;;
    1050710506  "Examples/Fortran_example/Makefile" ) CONFIG_FILES="$CONFIG_FILES Examples/Fortran_example/Makefile" ;;
  • branches/dev/configure.ac

    r451 r455  
    1010## AIX: ./configure CC=xlc F77=xlf CXX=xlC --with-lapack=$HOME/lib/liblapack.a CFLAGS=-g FFLAGS=-g CXXFLAGS="-g -qrtti=dyna" CXXLIBS="-lC -lc"
    1111## HP1: configure --with-asl=$HOME/COIN/OBJhp1/OTHERS/ASL/amplsolver.a --with-blas=/opt/fortran/lib/libblas.a --with-hsl=$HOME/COIN/OBJhp1/OTHERS/HSL/libiphsl.a --with-lapack=$HOME/COIN/OBJhp1/OTHERS/lapack/libiplapack.a F77=/opt/fortran/bin/fort77 CC=/opt/ansic/bin/cc CXX=/opt/aCC/bin/aCC FFLAGS='-g' CFLAGS='-g' CXXFLAGS='-AA -DMY_C_FINITE=isfinite -g' CXXLIBS='-L/opt/aCC/lib -l++ -lstd_v2 -lCsup_v2 -lm -lcl -lc'
     12# gridsun1: need AR='CC -xar' ARFLAGS='-o'
    1213
    1314AC_PREREQ(2.59)
     
    9091        add_cxxflags="-pipe"
    9192        dbg_cxxflags="-g"
    92         warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Werror -Wconversion"
     93        warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Werror -Wconversion"
    9394        case $build in
    9495          *-cygwin*) AC_MSG_CHECKING([whether flag \" -mno-cygwin\" works])
     
    146147      esac;;
    147148    *-sun-*)
    148              opt_cxxflags="-fast"
     149             opt_cxxflags="-O5 -xtarget=native"
    149150             dbg_cxxflags="-g";;
    150151    esac
     
    312313             dbg_cflags="-g";;
    313314    *-sun-*)
    314              opt_cflags="-fast"
     315             opt_cflags="-xO5 -xtarget=native"
    315316             dbg_cflags="-g";;
    316317    *-sgi-*)
     
    436437             dbg_fflags="-C -g";;
    437438    *-sun-*)
    438              opt_fflags="-fast"
     439             opt_fflags="-O5 -xtarget=native"
    439440             dbg_fflags="-g";;
    440441    *-sgi-*)
     
    945946    fi
    946947  fi
    947   ASLMAKEFILECMDS="sed 's/ar \$\$(ARFLAGS)/$AR \$\$(ARFLAGS)/' makefile.u | sed 's/ar ruv/$AR ruv/' "
     948  ASLMAKEFILECMDS="sed 's/ar \$\$(ARFLAGS)/$AR $ARFLAGS/' makefile.u | sed 's/ar ruv/$AR $ARFLAGS/' "
    948949  if test "$EXEEXT" = ".exe"; then
    949950    ASLMAKEFILECMDS="$ASLMAKEFILECMDS | sed 's/a.out/a.exe/'"
     
    10701071                 Algorithm/LinearSolvers/Makefile
    10711072                 Apps/Makefile Apps/AmplSolver/Makefile
    1072                  Apps/CompositeInterface/Makefile
    10731073                 Apps/CUTErInterface/Makefile
    10741074                 Examples/Fortran_example/Makefile
Note: See TracChangeset for help on using the changeset viewer.