Changeset 1471


Ignore:
Timestamp:
Jun 13, 2010 1:52:10 PM (8 years ago)
Author:
stefan
Message:

allow build against installed dependencies without presence of base directory: add build system scripts, adjust location of Makemain.inc - thanks to Lou for making this possible

Location:
trunk/Cbc
Files:
6 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/Makefile.am

    r1464 r1471  
    137137DISTCLEANFILES =
    138138
    139 include ../BuildTools/Makemain.inc
     139include BuildTools/Makemain.inc
  • trunk/Cbc/Makefile.in

    r1466 r1471  
    5959@ALWAYS_FALSE@am__append_1 = test
    6060DIST_COMMON = README $(am__configure_deps) \
    61         $(srcdir)/../BuildTools/Makemain.inc $(srcdir)/../config.guess \
    62         $(srcdir)/../config.sub $(srcdir)/../install-sh \
    63         $(srcdir)/../ltmain.sh $(srcdir)/../missing \
    64         $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
    65         $(srcdir)/cbc-uninstalled.pc.in $(srcdir)/cbc.pc.in \
    66         $(srcdir)/osi-cbc-uninstalled.pc.in $(srcdir)/osi-cbc.pc.in \
    67         $(top_srcdir)/configure $(top_srcdir)/examples/Makefile.in \
    68         $(top_srcdir)/inc/config_cbc.h.in AUTHORS INSTALL
     61        $(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \
     62        $(srcdir)/Makefile.in $(srcdir)/cbc-uninstalled.pc.in \
     63        $(srcdir)/cbc.pc.in $(srcdir)/osi-cbc-uninstalled.pc.in \
     64        $(srcdir)/osi-cbc.pc.in $(top_srcdir)/configure \
     65        $(top_srcdir)/examples/Makefile.in \
     66        $(top_srcdir)/inc/config_cbc.h.in AUTHORS INSTALL config.guess \
     67        config.sub depcomp install-sh ltmain.sh missing
    6968@HAVE_EXTERNALS_TRUE@am__append_2 = Externals
    7069@HAVE_EXTERNALS_TRUE@am__append_3 = .Externals-stamp
     
    412411am--refresh:
    413412        @:
    414 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../BuildTools/Makemain.inc $(am__configure_deps)
     413$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/BuildTools/Makemain.inc $(am__configure_deps)
    415414        @for dep in $?; do \
    416415          case '$(am__configure_deps)' in \
     
    650649        $(am__remove_distdir)
    651650        mkdir $(distdir)
    652         $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../BuildTools $(distdir)/doc $(distdir)/examples $(distdir)/inc
     651        $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/doc $(distdir)/examples $(distdir)/inc
    653652        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    654653        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  • trunk/Cbc/src/Makefile.in

    r1466 r1471  
    201201@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_11) \
    202202@CBC_BUILD_CBC_GENERIC_TRUE@    $(am__DEPENDENCIES_12)
    203 depcomp = $(SHELL) $(top_srcdir)/../depcomp
     203depcomp = $(SHELL) $(top_srcdir)/depcomp
    204204am__depfiles_maybe = depfiles
    205205CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  • trunk/Cbc/src/OsiCbc/Makefile.in

    r1466 r1471  
    7878am_libOsiCbc_la_OBJECTS = OsiCbcSolverInterface.lo
    7979libOsiCbc_la_OBJECTS = $(am_libOsiCbc_la_OBJECTS)
    80 depcomp = $(SHELL) $(top_srcdir)/../depcomp
     80depcomp = $(SHELL) $(top_srcdir)/depcomp
    8181am__depfiles_maybe = depfiles
    8282CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  • trunk/Cbc/test/Makefile.in

    r1467 r1471  
    108108        $(am__DEPENDENCIES_1)
    109109DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    110 depcomp = $(SHELL) $(top_srcdir)/../depcomp
     110depcomp = $(SHELL) $(top_srcdir)/depcomp
    111111am__depfiles_maybe = depfiles
    112112CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
Note: See TracChangeset for help on using the changeset viewer.