Ignore:
Timestamp:
Jun 15, 2011 8:04:48 AM (8 years ago)
Author:
stefan
Message:

rerun autotools; merge fixes in example Makefiles for mingw/cl from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/2.6/Cbc/Makefile.in

    r1579 r1672  
    6767        $(top_srcdir)/inc/config_cbc.h.in AUTHORS INSTALL config.guess \
    6868        config.sub depcomp install-sh ltmain.sh missing
    69 @HAVE_EXTERNALS_TRUE@am__append_2 = Externals
    70 @HAVE_EXTERNALS_TRUE@am__append_3 = .Externals-stamp
     69@HAVE_EXTERNALS_TRUE@am__append_2 = Dependencies
     70@HAVE_EXTERNALS_TRUE@am__append_3 = .Dependencies-stamp
    7171subdir = .
    7272ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    10431043@MAINTAINER_MODE_TRUE@  cp $< $@
    10441044
    1045 # Take care of updating externals (if Externals file exists)
    1046 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Externals-stamp
    1047 
    1048 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Externals-stamp: $(srcdir)/Externals
    1049 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn propset svn:externals -F Externals .
    1050 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Externals-stamp
    1051 
    1052 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp
     1045# Take care of updating externals (if Dependencies file exists)
     1046@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Dependencies-stamp
     1047
     1048@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Dependencies-stamp: $(srcdir)/Dependencies
     1049@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); BuildTools/set_externals Dependencies
     1050@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Dependencies-stamp
     1051
     1052@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Dependencies-stamp
    10531053@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn update
    10541054
Note: See TracChangeset for help on using the changeset viewer.