Ignore:
Timestamp:
Dec 16, 2013 9:44:00 AM (7 years ago)
Author:
tkr
Message:

Syncing with trunk at r3138

Location:
ThirdParty/ASL/stable/1.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/stable/1.2

  • ThirdParty/ASL/stable/1.2/Makefile.in

    r3065 r3141  
    6161build_triplet = @build@
    6262host_triplet = @host@
    63 @COIN_CC_IS_CL_FALSE@am__append_1 = libcoinasl.la
     63@COIN_CC_IS_CL_FALSE@libcoinasl_la_DEPENDENCIES =  \
     64@COIN_CC_IS_CL_FALSE@   $(am__DEPENDENCIES_2)
     65@DEPENDENCY_LINKING_TRUE@am__append_1 = $(ASL_PCLIBS)
     66@DEPENDENCY_LINKING_TRUE@@HOST_IS_CYGWIN_TRUE@am__append_2 = -Wl,--export-all-symbols
     67@COIN_CC_IS_CL_FALSE@am__append_3 = libcoinasl.la
    6468DIST_COMMON = $(am__configure_deps) $(srcdir)/BuildTools/Makemain.inc \
    6569        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
     
    6872        $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure \
    6973        config.guess config.sub depcomp install-sh ltmain.sh missing
    70 @HAVE_EXTERNALS_TRUE@am__append_2 = Dependencies
    71 @HAVE_EXTERNALS_TRUE@am__append_3 = .Dependencies-stamp
     74@HAVE_EXTERNALS_TRUE@am__append_4 = Dependencies
     75@HAVE_EXTERNALS_TRUE@am__append_5 = .Dependencies-stamp
    7276subdir = .
    7377ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    9296LTLIBRARIES = $(lib_LTLIBRARIES)
    9397am__DEPENDENCIES_1 =
     98@DEPENDENCY_LINKING_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
    9499am_libcoinasl_la_OBJECTS =
    95100libcoinasl_la_OBJECTS = $(am_libcoinasl_la_OBJECTS)
     
    174179HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    175180HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
     181HOST_IS_CYGWIN_FALSE = @HOST_IS_CYGWIN_FALSE@
     182HOST_IS_CYGWIN_TRUE = @HOST_IS_CYGWIN_TRUE@
     183HOST_TYPE = @HOST_TYPE@
    176184INSTALL_DATA = @INSTALL_DATA@
    177185INSTALL_PROGRAM = @INSTALL_PROGRAM@
     
    265273target_alias = @target_alias@
    266274AUTOMAKE_OPTIONS = foreign
    267 EXTRA_DIST = get.ASL INSTALL.ASL $(am__append_2)
     275EXTRA_DIST = get.ASL INSTALL.ASL $(am__append_4)
    268276@COIN_CC_IS_CL_TRUE@lib_LTLIBRARIES = libcoinasl.la
    269277@COIN_CC_IS_CL_TRUE@libcoinasl_la_SOURCES =
    270 @COIN_CC_IS_CL_TRUE@libcoinasl_la_LIBADD = $(AMPLSOLVER_A)
     278@COIN_CC_IS_CL_FALSE@libcoinasl_la_LIBADD = $(am__append_1)
     279@COIN_CC_IS_CL_TRUE@libcoinasl_la_LIBADD = $(AMPLSOLVER_A) \
     280@COIN_CC_IS_CL_TRUE@    $(am__append_1)
    271281@COIN_CC_IS_CL_TRUE@libcoinasl_la_DEPENDENCIES = $(AMPLSOLVER_A)
     282@COIN_CC_IS_CL_FALSE@libcoinasl_la_LDFLAGS = $(am__append_2)
    272283
    273284# This is for libtool
    274 @COIN_CC_IS_CL_TRUE@libcoinasl_la_LDFLAGS = $(LT_LDFLAGS)
     285@COIN_CC_IS_CL_TRUE@libcoinasl_la_LDFLAGS = $(LT_LDFLAGS) \
     286@COIN_CC_IS_CL_TRUE@    $(am__append_2)
    275287
    276288########################################################################
     
    278290########################################################################
    279291compdir = compdir
    280 alltargets = stdio1.h arith.h funcadd0.$(OBJEXT) $(am__append_1)
     292alltargets = stdio1.h arith.h funcadd0.$(OBJEXT) $(am__append_3)
    281293thirdpartyincludedir = $(includedir)/coin/ThirdParty
    282294thirdpartyinclude_HEADERS = \
     
    294306
    295307# Files that are generated and should be cleaned with make distclean
    296 DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
     308DISTCLEANFILES = $(am__append_5) $(VPATH_DISTCLEANFILES)
    297309DocFiles = README AUTHORS LICENSE
    298310DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
     
    707719@COIN_CC_IS_CL_TRUE@$(AMPLSOLVER_A):
    708720@COIN_CC_IS_CL_TRUE@    ./compile_MS_ASL
    709 
    710721@COIN_CC_IS_CL_FALSE@$(AMPLSOLVER_A):
    711722@COIN_CC_IS_CL_FALSE@   ./compile_Unix_ASL
     
    721732@COIN_CC_IS_CL_FALSE@     echo "non_pic_object='$$i'" >> $$lofile ; \
    722733@COIN_CC_IS_CL_FALSE@   done ; cd ..
    723 @COIN_CC_IS_CL_FALSE@   $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -rpath $(libdir) $(LT_LDFLAGS) linkdir/*.lo
     734@COIN_CC_IS_CL_FALSE@   $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -rpath $(libdir) $(LT_LDFLAGS) linkdir/*.lo $(libcoinasl_la_LIBADD) $(libcoinasl_la_LDFLAGS)
    724735@COIN_CC_IS_CL_FALSE@   rm -rf linkdir
    725736
Note: See TracChangeset for help on using the changeset viewer.