Changeset 1563


Ignore:
Timestamp:
Jun 13, 2010 1:53:25 PM (9 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/Clp
Files:
6 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.am

    r1559 r1563  
    119119DISTCLEANFILES =
    120120
    121 include ../BuildTools/Makemain.inc
     121include BuildTools/Makemain.inc
  • trunk/Clp/Makefile.in

    r1559 r1563  
    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)/clp-uninstalled.pc.in $(srcdir)/clp.pc.in \
    66         $(top_srcdir)/configure $(top_srcdir)/examples/Makefile.in \
     61        $(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \
     62        $(srcdir)/Makefile.in $(srcdir)/clp-uninstalled.pc.in \
     63        $(srcdir)/clp.pc.in $(top_srcdir)/configure \
     64        $(top_srcdir)/examples/Makefile.in \
    6765        $(top_srcdir)/inc/config_clp.h.in \
    68         $(top_srcdir)/src/OsiClp/osi-clp-uninstalled.pc.in AUTHORS
     66        $(top_srcdir)/src/OsiClp/osi-clp-uninstalled.pc.in AUTHORS \
     67        config.guess 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
     
    333332am--refresh:
    334333        @:
    335 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../BuildTools/Makemain.inc $(am__configure_deps)
     334$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/BuildTools/Makemain.inc $(am__configure_deps)
    336335        @for dep in $?; do \
    337336          case '$(am__configure_deps)' in \
     
    569568        $(am__remove_distdir)
    570569        mkdir $(distdir)
    571         $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../BuildTools $(distdir)/doc $(distdir)/doc/Howto $(distdir)/examples $(distdir)/inc $(distdir)/src/OsiClp
     570        $(mkdir_p) $(distdir)/. $(distdir)/BuildTools $(distdir)/doc $(distdir)/doc/Howto $(distdir)/examples $(distdir)/inc $(distdir)/src/OsiClp
    572571        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    573572        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  • trunk/Clp/src/Makefile.in

    r1559 r1563  
    9696clp_DEPENDENCIES = libClp.la $(am__DEPENDENCIES_1) \
    9797        $(am__DEPENDENCIES_1)
    98 depcomp = $(SHELL) $(top_srcdir)/../depcomp
     98depcomp = $(SHELL) $(top_srcdir)/depcomp
    9999am__depfiles_maybe = depfiles
    100100CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  • trunk/Clp/src/OsiClp/Makefile.in

    r1559 r1563  
    6969am_libOsiClp_la_OBJECTS = OsiClpSolverInterface.lo
    7070libOsiClp_la_OBJECTS = $(am_libOsiClp_la_OBJECTS)
    71 depcomp = $(SHELL) $(top_srcdir)/../depcomp
     71depcomp = $(SHELL) $(top_srcdir)/depcomp
    7272am__depfiles_maybe = depfiles
    7373CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  • trunk/Clp/test/Makefile.in

    r1559 r1563  
    6969@COIN_HAS_OSITESTS_TRUE@        ../src/OsiClp/libOsiClp.la
    7070DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    71 depcomp = $(SHELL) $(top_srcdir)/../depcomp
     71depcomp = $(SHELL) $(top_srcdir)/depcomp
    7272am__depfiles_maybe = depfiles
    7373CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
Note: See TracChangeset for help on using the changeset viewer.