Changeset 72 for ThirdParty/ASL


Ignore:
Timestamp:
Jun 23, 2006 4:23:29 PM (14 years ago)
Author:
andreasw
Message:

several improvements for MSys

Location:
ThirdParty/ASL/trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/trunk/Makefile.am

    r47 r72  
    1515compdir = compdir
    1616
    17 libampl   = amplsolver.a
     17libampl   = $(AMPLSOLVER_A)
    1818
    19 all-local: $(libampl) stdio1.h arith.h funcadd0.o
     19all-local: $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
    2020
     21if MSVC_COMPILE
     22$(libampl):
     23        @echo " "
     24        @echo "*********************************************************************"
     25        @echo " "
     26        @echo "Please change into the following directory and type ./compile_MS_ASL"
     27        @pwd
     28        @echo " "
     29        @echo "*********************************************************************"
     30        @exit 1
     31#       set -x -v; \
     32#       rm -rf $(compdir) ; \
     33#       $(mkinstalldirs) $(compdir); \
     34#       files=`cd $(abs_source_dir)/solvers; ls *.[chs] *.[ch]0 *.hd arith.* makefile* *.bat amplsolv.lbc`; \
     35#       cd $(compdir); \
     36#       for file in $$files; \
     37#       do \
     38#         rm -f $$file ;\
     39#         cp $(abs_source_dir)/solvers/$$file $$file ;\
     40#       done; \
     41#       cp details.c0 details.c; \
     42#       rm -f makefile; \
     43#       nmake.exe   
     44#       mv $(compdir)/amplsolv.lib $(libampl)
     45#       -cd $(compdir); mv stdio1.h arith.h funcadd0.o ..
     46#       rm -rf $(compdir)
     47else
    2148$(libampl):
    2249        rm -rf $(compdir) ; \
     
    2653        for file in $$files; \
    2754        do \
     55          rm -f $$file ;\
    2856          $(LN_S) $(abs_source_dir)/solvers/$$file $$file ;\
    2957        done; \
     
    3361        $(MAKE) $(ASLMAKEFLAGS) CC="$(CC)" ;\
    3462        mv amplsolver.a ../$(libampl)
    35         -cd $(compdir); mv stdio1.h arith.h funcadd0.o ..
     63        -cd $(compdir); mv stdio1.h arith.h funcadd0.$(OBJEXT) ..
    3664        rm -rf $(compdir)
     65endif
    3766
    3867stdio1.h arith.h funcadd0.o: $(libampl)
    3968
    40 CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.o
     69CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
    4170
    4271########################################################################
  • ThirdParty/ASL/trunk/Makefile.in

    r53 r72  
    5454        $(srcdir)/../../install-sh $(srcdir)/../../missing \
    5555        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
    56         $(top_srcdir)/configure
     56        $(srcdir)/compile_MS_ASL.in $(top_srcdir)/configure
    5757@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    5858@HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
     
    6666 configure.lineno configure.status.lineno
    6767mkinstalldirs = $(install_sh) -d
    68 CONFIG_CLEAN_FILES =
     68CONFIG_CLEAN_FILES = compile_MS_ASL
    6969SOURCES =
    7070DIST_SOURCES =
     
    8181distcleancheck_listfiles = find . -type f -print
    8282ACLOCAL = @ACLOCAL@
     83ADDLIBS = @ADDLIBS@
    8384ADD_CFLAGS = @ADD_CFLAGS@
     85ALWAYS_FALSE_FALSE = @ALWAYS_FALSE_FALSE@
     86ALWAYS_FALSE_TRUE = @ALWAYS_FALSE_TRUE@
    8487AMDEP_FALSE = @AMDEP_FALSE@
    8588AMDEP_TRUE = @AMDEP_TRUE@
     89AMPLSOLVER_A = @AMPLSOLVER_A@
    8690AMTAR = @AMTAR@
    8791ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
     
    108112EGREP = @EGREP@
    109113EXEEXT = @EXEEXT@
     114FADDLIBS = @FADDLIBS@
    110115HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    111116HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
     
    125130MAKEINFO = @MAKEINFO@
    126131MPICC = @MPICC@
     132MSVC_COMPILE_FALSE = @MSVC_COMPILE_FALSE@
     133MSVC_COMPILE_TRUE = @MSVC_COMPILE_TRUE@
    127134OBJEXT = @OBJEXT@
    128135PACKAGE = @PACKAGE@
     
    185192########################################################################
    186193compdir = compdir
    187 libampl = amplsolver.a
    188 CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.o
     194libampl = $(AMPLSOLVER_A)
     195CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
    189196
    190197########################################################################
     
    230237$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    231238        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
     239compile_MS_ASL: $(top_builddir)/config.status $(srcdir)/compile_MS_ASL.in
     240        cd $(top_builddir) && $(SHELL) ./config.status $@
    232241uninstall-info-am:
    233242tags: TAGS
     
    241250        $(am__remove_distdir)
    242251        mkdir $(distdir)
    243         $(mkdir_p) $(distdir)/../.. $(distdir)/../../BuildTools
     252        $(mkdir_p) $(distdir)/. $(distdir)/../.. $(distdir)/../../BuildTools
    244253        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    245254        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    456465
    457466
    458 all-local: $(libampl) stdio1.h arith.h funcadd0.o
    459 
    460 $(libampl):
    461         rm -rf $(compdir) ; \
    462         $(mkinstalldirs) $(compdir); \
    463         files=`cd $(abs_source_dir)/solvers; ls *.[chs] *.[ch]0 *.hd arith.* makefile* `; \
    464         cd $(compdir); \
    465         for file in $$files; \
    466         do \
    467           $(LN_S) $(abs_source_dir)/solvers/$$file $$file ;\
    468         done; \
    469         rm -f makefile; \
    470         $(ASLMAKEFILECMDS); \
    471         $(MAKE) $(ASLMAKEFLAGS) CC="$(CC)" clean ;\
    472         $(MAKE) $(ASLMAKEFLAGS) CC="$(CC)" ;\
    473         mv amplsolver.a ../$(libampl)
    474         -cd $(compdir); mv stdio1.h arith.h funcadd0.o ..
    475         rm -rf $(compdir)
     467all-local: $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
     468
     469@MSVC_COMPILE_TRUE@$(libampl):
     470@MSVC_COMPILE_TRUE@     @echo " "
     471@MSVC_COMPILE_TRUE@     @echo "*********************************************************************"
     472@MSVC_COMPILE_TRUE@     @echo " "
     473@MSVC_COMPILE_TRUE@     @echo "Please change into the following directory and type ./compile_MS_ASL"
     474@MSVC_COMPILE_TRUE@     @pwd
     475@MSVC_COMPILE_TRUE@     @echo " "
     476@MSVC_COMPILE_TRUE@     @echo "*********************************************************************"
     477@MSVC_COMPILE_TRUE@     @exit 1
     478#       set -x -v; \
     479#       rm -rf $(compdir) ; \
     480#       $(mkinstalldirs) $(compdir); \
     481#       files=`cd $(abs_source_dir)/solvers; ls *.[chs] *.[ch]0 *.hd arith.* makefile* *.bat amplsolv.lbc`; \
     482#       cd $(compdir); \
     483#       for file in $$files; \
     484#       do \
     485#         rm -f $$file ;\
     486#         cp $(abs_source_dir)/solvers/$$file $$file ;\
     487#       done; \
     488#       cp details.c0 details.c; \
     489#       rm -f makefile; \
     490#       nmake.exe   
     491#       mv $(compdir)/amplsolv.lib $(libampl)
     492#       -cd $(compdir); mv stdio1.h arith.h funcadd0.o ..
     493#       rm -rf $(compdir)
     494@MSVC_COMPILE_FALSE@$(libampl):
     495@MSVC_COMPILE_FALSE@    rm -rf $(compdir) ; \
     496@MSVC_COMPILE_FALSE@    $(mkinstalldirs) $(compdir); \
     497@MSVC_COMPILE_FALSE@    files=`cd $(abs_source_dir)/solvers; ls *.[chs] *.[ch]0 *.hd arith.* makefile* `; \
     498@MSVC_COMPILE_FALSE@    cd $(compdir); \
     499@MSVC_COMPILE_FALSE@    for file in $$files; \
     500@MSVC_COMPILE_FALSE@    do \
     501@MSVC_COMPILE_FALSE@      rm -f $$file ;\
     502@MSVC_COMPILE_FALSE@      $(LN_S) $(abs_source_dir)/solvers/$$file $$file ;\
     503@MSVC_COMPILE_FALSE@    done; \
     504@MSVC_COMPILE_FALSE@    rm -f makefile; \
     505@MSVC_COMPILE_FALSE@    $(ASLMAKEFILECMDS); \
     506@MSVC_COMPILE_FALSE@    $(MAKE) $(ASLMAKEFLAGS) CC="$(CC)" clean ;\
     507@MSVC_COMPILE_FALSE@    $(MAKE) $(ASLMAKEFLAGS) CC="$(CC)" ;\
     508@MSVC_COMPILE_FALSE@    mv amplsolver.a ../$(libampl)
     509@MSVC_COMPILE_FALSE@    -cd $(compdir); mv stdio1.h arith.h funcadd0.$(OBJEXT) ..
     510@MSVC_COMPILE_FALSE@    rm -rf $(compdir)
    476511
    477512stdio1.h arith.h funcadd0.o: $(libampl)
  • ThirdParty/ASL/trunk/configure

    r63 r72  
    282282ac_unique_file="solvers/asl.h"
    283283ac_default_prefix=`pwd`
    284 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 COIN_DEBUG_TRUE COIN_DEBUG_FALSE EGREP LN_S CDEFS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT ADD_CFLAGS MPICC 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 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 ASLMAKEFLAGS ASLMAKEFILECMDS LIBOBJS LTLIBOBJS VPATH_DISTCLEANFILES'
     284ac_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 ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE build build_cpu build_vendor build_os COIN_DEBUG_TRUE COIN_DEBUG_FALSE EGREP LN_S CDEFS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT ADD_CFLAGS MPICC 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 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 AMPLSOLVER_A MSVC_COMPILE_TRUE MSVC_COMPILE_FALSE ASLMAKEFLAGS ASLMAKEFILECMDS LIBOBJS LTLIBOBJS VPATH_DISTCLEANFILES'
    285285ac_subst_files=''
    286286
     
    13231323
    13241324
     1325# Initialize the ADDLIBS variable
     1326ADDLIBS='-lm'
     1327
     1328
     1329# Initialize the FADDLIBS variable (which is to be used with a fortran
     1330# compiler and will not include FLIBS)
     1331FADDLIBS=
     1332
     1333
     1334# A useful makefile conditional that is always false
     1335
     1336
     1337if false; then
     1338  ALWAYS_FALSE_TRUE=
     1339  ALWAYS_FALSE_FALSE='#'
     1340else
     1341  ALWAYS_FALSE_TRUE='#'
     1342  ALWAYS_FALSE_FALSE=
     1343fi
     1344
     1345
     1346# We set the following variable so that we know later in AC_COIN_FINALIZE
     1347# that we are in a project main directory
     1348coin_projectdir=yes
     1349
     1350
    13251351#############################################################################
    13261352#                         Standard build tool stuff                         #
     
    15051531  *)         comps="xlc cc gcc pgcc icc" ;;
    15061532esac
     1533
     1534# We delete the cached value, since the test might not have been
     1535# performed with out choise of compilers earlier
     1536ac_cv_prog_CC=
    15071537ac_ext=c
    15081538ac_cpp='$CPP $CPPFLAGS'
     
    35923622#############################################################################
    35933623
     3624# Determine the name of the ASL library
     3625
     3626case "$CXX" in
     3627  cl* | */cl*)
     3628    AMPLSOLVER_A=amplsolv.lib
     3629    msvc_compile=yes ;;
     3630  *)
     3631    AMPLSOLVER_A=amplsolver.a
     3632    msvc_compile=no ;;
     3633esac
     3634
     3635
     3636if test $msvc_compile = yes; then
     3637  MSVC_COMPILE_TRUE=
     3638  MSVC_COMPILE_FALSE='#'
     3639else
     3640  MSVC_COMPILE_TRUE='#'
     3641  MSVC_COMPILE_FALSE=
     3642fi
     3643
     3644
    35943645if test -z "$ASLMAKEFLAGS" ; then
    35953646  asladdcflags=
     
    36613712
    36623713
    3663           ac_config_files="$ac_config_files Makefile"
    3664 
    3665 
    3666 
     3714                    ac_config_files="$ac_config_files Makefile compile_MS_ASL"
     3715
     3716
     3717
     3718FADDLIBS="$ADDLIBS"
    36673719if test x"$coin_need_flibs" = xyes; then
    36683720  ADDLIBS="$ADDLIBS $FLIBS"
     
    37913843
    37923844
     3845if test -z "${ALWAYS_FALSE_TRUE}" && test -z "${ALWAYS_FALSE_FALSE}"; then
     3846  { { echo "$as_me:$LINENO: error: conditional \"ALWAYS_FALSE\" was never defined.
     3847Usually this means the macro was only invoked conditionally." >&5
     3848echo "$as_me: error: conditional \"ALWAYS_FALSE\" was never defined.
     3849Usually this means the macro was only invoked conditionally." >&2;}
     3850   { (exit 1); exit 1; }; }
     3851fi
    37933852if test -z "${COIN_DEBUG_TRUE}" && test -z "${COIN_DEBUG_FALSE}"; then
    37943853  { { echo "$as_me:$LINENO: error: conditional \"COIN_DEBUG\" was never defined.
     
    38233882Usually this means the macro was only invoked conditionally." >&5
    38243883echo "$as_me: error: conditional \"HAVE_EXTERNALS\" was never defined.
     3884Usually this means the macro was only invoked conditionally." >&2;}
     3885   { (exit 1); exit 1; }; }
     3886fi
     3887if test -z "${MSVC_COMPILE_TRUE}" && test -z "${MSVC_COMPILE_FALSE}"; then
     3888  { { echo "$as_me:$LINENO: error: conditional \"MSVC_COMPILE\" was never defined.
     3889Usually this means the macro was only invoked conditionally." >&5
     3890echo "$as_me: error: conditional \"MSVC_COMPILE\" was never defined.
    38253891Usually this means the macro was only invoked conditionally." >&2;}
    38263892   { (exit 1); exit 1; }; }
     
    42664332  # Handling of arguments.
    42674333  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     4334  "compile_MS_ASL" ) CONFIG_FILES="$CONFIG_FILES compile_MS_ASL" ;;
    42684335  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    42694336  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
     
    43514418s,@ECHO_T@,$ECHO_T,;t t
    43524419s,@LIBS@,$LIBS,;t t
     4420s,@ADDLIBS@,$ADDLIBS,;t t
     4421s,@FADDLIBS@,$FADDLIBS,;t t
     4422s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t
     4423s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
    43534424s,@build@,$build,;t t
    43544425s,@build_cpu@,$build_cpu,;t t
     
    44154486s,@HAVE_EXTERNALS_TRUE@,$HAVE_EXTERNALS_TRUE,;t t
    44164487s,@HAVE_EXTERNALS_FALSE@,$HAVE_EXTERNALS_FALSE,;t t
     4488s,@AMPLSOLVER_A@,$AMPLSOLVER_A,;t t
     4489s,@MSVC_COMPILE_TRUE@,$MSVC_COMPILE_TRUE,;t t
     4490s,@MSVC_COMPILE_FALSE@,$MSVC_COMPILE_FALSE,;t t
    44174491s,@ASLMAKEFLAGS@,$ASLMAKEFLAGS,;t t
    44184492s,@ASLMAKEFILECMDS@,$ASLMAKEFILECMDS,;t t
  • ThirdParty/ASL/trunk/configure.ac

    r63 r72  
    3131AC_PREFIX_DEFAULT([`pwd`])
    3232
     33AC_COIN_PROJECTDIR_INIT
     34
    3335#############################################################################
    3436#                         Standard build tool stuff                         #
     
    5961#                          AMPL SOLVER LIBRARY                              #
    6062#############################################################################
     63
     64# Determine the name of the ASL library
     65AC_SUBST(AMPLSOLVER_A)
     66case "$CXX" in
     67  cl* | */cl*)
     68    AMPLSOLVER_A=amplsolv.lib
     69    msvc_compile=yes ;;
     70  *)
     71    AMPLSOLVER_A=amplsolver.a
     72    msvc_compile=no ;;
     73esac
     74AM_CONDITIONAL(MSVC_COMPILE, test $msvc_compile = yes)
    6175
    6276if test -z "$ASLMAKEFLAGS" ; then
     
    126140AC_SUBST(ASLMAKEFILECMDS)
    127141
    128 AC_CONFIG_FILES([Makefile])
     142AC_CONFIG_FILES([Makefile compile_MS_ASL])
    129143
    130144AC_COIN_FINALIZE
Note: See TracChangeset for help on using the changeset viewer.