Changeset 1151


Ignore:
Timestamp:
Feb 17, 2008 10:56:03 AM (11 years ago)
Author:
andreasw
Message:

reran autotools; made sure that addlibs.txt files are now installed in $(prefix)/share/doc/coin/$(PACKAGE_NAME)/

Location:
trunk/Ipopt
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/Ipopt/Makefile.in

    r1146 r1151  
    206206INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    207207IPALLLIBS = @IPALLLIBS@
     208IPOPTDOCDIR = @IPOPTDOCDIR@
    208209IPOPTOBJDIR = @IPOPTOBJDIR@
    209210IPOPTSRCDIR = @IPOPTSRCDIR@
  • trunk/Ipopt/configure

    r1146 r1151  
    472472#endif"
    473473
    474 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE EGREP LN_S CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX CXXLIBS ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 FLIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS BLUEGENEEXTRA AIX_FIX_COMPILER_BUG_TRUE AIX_FIX_COMPILER_BUG_FALSE IPOPTSRCDIR IPOPTOBJDIR COIN_HAS_IPOPT_TRUE COIN_HAS_IPOPT_FALSE BITS_PER_POINTER BIT32FCOMMENT BIT64FCOMMENT CXXAR COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE COIN_BUILD_BLAS_TRUE COIN_BUILD_BLAS_FALSE COIN_HAS_LAPACK_TRUE COIN_HAS_LAPACK_FALSE COIN_BUILD_LAPACK_TRUE COIN_BUILD_LAPACK_FALSE TAUCS_INCFLAGS MUMPS_INCFLAGS COIN_HAS_MUMPS_TRUE COIN_HAS_MUMPS_FALSE COIN_BUILD_MUMPS_TRUE COIN_BUILD_MUMPS_FALSE ASLLIB ASL_CPPFLAGS COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE JAVA_HOME JIPOPTDLL SHARED_FLAGS ASTYLE ASTYLEFLAGS ipoptlib IPALLLIBS HAVE_MA27_TRUE HAVE_MA27_FALSE HAVE_MA57_TRUE HAVE_MA57_FALSE HAVE_MA28_TRUE HAVE_MA28_FALSE HAVE_MC19_TRUE HAVE_MC19_FALSE HAVE_PARDISO_TRUE HAVE_PARDISO_FALSE HAVE_TAUCS_TRUE HAVE_TAUCS_FALSE HAVE_WSMP_TRUE HAVE_WSMP_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
     474ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE EGREP LN_S CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX CXXLIBS ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 FLIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS BLUEGENEEXTRA AIX_FIX_COMPILER_BUG_TRUE AIX_FIX_COMPILER_BUG_FALSE IPOPTSRCDIR IPOPTOBJDIR IPOPTDOCDIR COIN_HAS_IPOPT_TRUE COIN_HAS_IPOPT_FALSE BITS_PER_POINTER BIT32FCOMMENT BIT64FCOMMENT CXXAR COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE COIN_BUILD_BLAS_TRUE COIN_BUILD_BLAS_FALSE COIN_HAS_LAPACK_TRUE COIN_HAS_LAPACK_FALSE COIN_BUILD_LAPACK_TRUE COIN_BUILD_LAPACK_FALSE TAUCS_INCFLAGS MUMPS_INCFLAGS COIN_HAS_MUMPS_TRUE COIN_HAS_MUMPS_FALSE COIN_BUILD_MUMPS_TRUE COIN_BUILD_MUMPS_FALSE ASLLIB ASL_CPPFLAGS COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE JAVA_HOME JIPOPTDLL SHARED_FLAGS ASTYLE ASTYLEFLAGS ipoptlib IPALLLIBS HAVE_MA27_TRUE HAVE_MA27_FALSE HAVE_MA57_TRUE HAVE_MA57_FALSE HAVE_MA28_TRUE HAVE_MA28_FALSE HAVE_MC19_TRUE HAVE_MC19_FALSE HAVE_PARDISO_TRUE HAVE_PARDISO_FALSE HAVE_TAUCS_TRUE HAVE_TAUCS_FALSE HAVE_WSMP_TRUE HAVE_WSMP_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
    475475ac_subst_files=''
    476476
     
    2193621936
    2193721937  IPOPTOBJDIR=`pwd`/$coin_has_ipopt
     21938
     21939  IPOPTDOCDIR=$abs_lib_dir/../share/doc/coin/Ipopt
    2193821940fi
    2193921941
     
    3308333085s,@IPOPTSRCDIR@,$IPOPTSRCDIR,;t t
    3308433086s,@IPOPTOBJDIR@,$IPOPTOBJDIR,;t t
     33087s,@IPOPTDOCDIR@,$IPOPTDOCDIR,;t t
    3308533088s,@COIN_HAS_IPOPT_TRUE@,$COIN_HAS_IPOPT_TRUE,;t t
    3308633089s,@COIN_HAS_IPOPT_FALSE@,$COIN_HAS_IPOPT_FALSE,;t t
  • trunk/Ipopt/contrib/JavaInterface/Makefile.in

    r1123 r1151  
    3232
    3333# Directory with header files
    34 IPOPTINCDIR = @includedir@/ipopt
     34IPOPTINCDIR = @includedir@/coin
    3535
    3636# Directory with libipopt.a
  • trunk/Ipopt/src/Algorithm/LinearSolvers/Makefile.in

    r1120 r1151  
    234234INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    235235IPALLLIBS = @IPALLLIBS@
     236IPOPTDOCDIR = @IPOPTDOCDIR@
    236237IPOPTOBJDIR = @IPOPTOBJDIR@
    237238IPOPTSRCDIR = @IPOPTSRCDIR@
  • trunk/Ipopt/src/Algorithm/Makefile.in

    r1120 r1151  
    199199INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    200200IPALLLIBS = @IPALLLIBS@
     201IPOPTDOCDIR = @IPOPTDOCDIR@
    201202IPOPTOBJDIR = @IPOPTOBJDIR@
    202203IPOPTSRCDIR = @IPOPTSRCDIR@
  • trunk/Ipopt/src/Apps/AmplSolver/Makefile.in

    r1120 r1151  
    183183INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    184184IPALLLIBS = @IPALLLIBS@
     185IPOPTDOCDIR = @IPOPTDOCDIR@
    185186IPOPTOBJDIR = @IPOPTOBJDIR@
    186187IPOPTSRCDIR = @IPOPTSRCDIR@
  • trunk/Ipopt/src/Apps/CUTErInterface/Makefile.in

    r1118 r1151  
    159159INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    160160IPALLLIBS = @IPALLLIBS@
     161IPOPTDOCDIR = @IPOPTDOCDIR@
    161162IPOPTOBJDIR = @IPOPTOBJDIR@
    162163IPOPTSRCDIR = @IPOPTSRCDIR@
  • trunk/Ipopt/src/Apps/Makefile.in

    r1120 r1151  
    158158INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    159159IPALLLIBS = @IPALLLIBS@
     160IPOPTDOCDIR = @IPOPTDOCDIR@
    160161IPOPTOBJDIR = @IPOPTOBJDIR@
    161162IPOPTSRCDIR = @IPOPTSRCDIR@
  • trunk/Ipopt/src/Common/Makefile.in

    r1135 r1151  
    185185INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    186186IPALLLIBS = @IPALLLIBS@
     187IPOPTDOCDIR = @IPOPTDOCDIR@
    187188IPOPTOBJDIR = @IPOPTOBJDIR@
    188189IPOPTSRCDIR = @IPOPTSRCDIR@
  • trunk/Ipopt/src/Interfaces/Makefile.am

    r1135 r1151  
    1 # Copyright (C) 2004, 2006 International Business Machines and others.
     1# Copyright (C) 2004, 2007 International Business Machines and others.
    22# All Rights Reserved.
    33# This file is distributed under the Common Public License.
     
    4444libipopt_la_LDFLAGS = $(LT_LDFLAGS)
    4545
     46addlibsdir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)/
     47
    4648ADDLIBS_FILES = \
    4749        ipopt_addlibs_cpp.txt \
     
    6466install-exec-local:
    6567        for i in $(ADDLIBS_FILES); do \
    66           $(install_sh_DATA) $$i $(DESTDIR)$(libdir)/$$i; \
     68          $(install_sh_DATA) $$i $(DESTDIR)$(addlibsdir)/$$i; \
    6769        done
    6870
    6971uninstall-local:
    7072        for i in $(ADDLIBS_FILES); do \
    71           rm -f $(DESTDIR)$(libdir)/$$i; \
     73          rm -f $(DESTDIR)$(addlibsdir)/$$i; \
    7274        done
    7375
  • trunk/Ipopt/src/Interfaces/Makefile.in

    r1135 r1151  
    1515@SET_MAKE@
    1616
    17 # Copyright (C) 2004, 2006 International Business Machines and others.
     17# Copyright (C) 2004, 2007 International Business Machines and others.
    1818# All Rights Reserved.
    1919# This file is distributed under the Common Public License.
     
    193193INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    194194IPALLLIBS = @IPALLLIBS@
     195IPOPTDOCDIR = @IPOPTDOCDIR@
    195196IPOPTOBJDIR = @IPOPTOBJDIR@
    196197IPOPTSRCDIR = @IPOPTSRCDIR@
     
    320321libipopt_la_DEPENDENCIES = $(IPALLLIBS)
    321322libipopt_la_LDFLAGS = $(LT_LDFLAGS)
     323addlibsdir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)/
    322324ADDLIBS_FILES = \
    323325        ipopt_addlibs_cpp.txt \
     
    670672install-exec-local:
    671673        for i in $(ADDLIBS_FILES); do \
    672           $(install_sh_DATA) $$i $(DESTDIR)$(libdir)/$$i; \
     674          $(install_sh_DATA) $$i $(DESTDIR)$(addlibsdir)/$$i; \
    673675        done
    674676
    675677uninstall-local:
    676678        for i in $(ADDLIBS_FILES); do \
    677           rm -f $(DESTDIR)$(libdir)/$$i; \
     679          rm -f $(DESTDIR)$(addlibsdir)/$$i; \
    678680        done
    679681
  • trunk/Ipopt/src/LinAlg/Makefile.in

    r1135 r1151  
    198198INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    199199IPALLLIBS = @IPALLLIBS@
     200IPOPTDOCDIR = @IPOPTDOCDIR@
    200201IPOPTOBJDIR = @IPOPTOBJDIR@
    201202IPOPTSRCDIR = @IPOPTSRCDIR@
  • trunk/Ipopt/src/LinAlg/TMatrices/Makefile.in

    r1120 r1151  
    174174INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    175175IPALLLIBS = @IPALLLIBS@
     176IPOPTDOCDIR = @IPOPTDOCDIR@
    176177IPOPTOBJDIR = @IPOPTOBJDIR@
    177178IPOPTSRCDIR = @IPOPTSRCDIR@
  • trunk/Ipopt/src/contrib/CGPenalty/Makefile.in

    r1120 r1151  
    176176INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    177177IPALLLIBS = @IPALLLIBS@
     178IPOPTDOCDIR = @IPOPTDOCDIR@
    178179IPOPTOBJDIR = @IPOPTOBJDIR@
    179180IPOPTSRCDIR = @IPOPTSRCDIR@
  • trunk/Ipopt/test/Makefile.in

    r1120 r1151  
    193193INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    194194IPALLLIBS = @IPALLLIBS@
     195IPOPTDOCDIR = @IPOPTDOCDIR@
    195196IPOPTOBJDIR = @IPOPTOBJDIR@
    196197IPOPTSRCDIR = @IPOPTSRCDIR@
Note: See TracChangeset for help on using the changeset viewer.