Changeset 1568


Ignore:
Timestamp:
Jun 13, 2010 1:55:10 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:
ThirdParty/Glpk/trunk
Files:
6 added
2 edited

Legend:

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

    r1548 r1568  
    157157DISTCLEANFILES = $(MAKEOKFILE)
    158158
    159 include ../../BuildTools/Makemain.inc
     159include BuildTools/Makemain.inc
  • ThirdParty/Glpk/trunk/Makefile.in

    r1548 r1568  
    5353build_triplet = @build@
    5454host_triplet = @host@
    55 DIST_COMMON = $(am__configure_deps) \
    56         $(srcdir)/../../BuildTools/Makemain.inc \
    57         $(srcdir)/../../config.guess $(srcdir)/../../config.sub \
    58         $(srcdir)/../../depcomp $(srcdir)/../../install-sh \
    59         $(srcdir)/../../ltmain.sh $(srcdir)/../../missing \
     55DIST_COMMON = $(am__configure_deps) $(srcdir)/BuildTools/Makemain.inc \
    6056        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
    6157        $(srcdir)/coinglpk-uninstalled.pc.in $(srcdir)/coinglpk.pc.in \
    6258        $(srcdir)/config_glpk.h.in $(thirdpartyinclude_HEADERS) \
    63         $(top_srcdir)/configure
     59        $(top_srcdir)/configure config.guess config.sub depcomp \
     60        install-sh ltmain.sh missing
    6461@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    6562@HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
     
    111108        amd_valid.lo colamd.lo
    112109libcoinglpk_la_OBJECTS = $(am_libcoinglpk_la_OBJECTS)
    113 depcomp = $(SHELL) $(top_srcdir)/../../depcomp
     110depcomp = $(SHELL) $(top_srcdir)/depcomp
    114111am__depfiles_maybe = depfiles
    115112COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
     
    426423am--refresh:
    427424        @:
    428 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../BuildTools/Makemain.inc $(am__configure_deps)
     425$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/BuildTools/Makemain.inc $(am__configure_deps)
    429426        @for dep in $?; do \
    430427          case '$(am__configure_deps)' in \
     
    15121509        $(am__remove_distdir)
    15131510        mkdir $(distdir)
    1514         $(mkdir_p) $(distdir)/$(GLPKDIR)/include $(distdir)/. $(distdir)/../.. $(distdir)/../../BuildTools
     1511        $(mkdir_p) $(distdir)/$(GLPKDIR)/include $(distdir)/. $(distdir)/BuildTools
    15151512        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    15161513        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
Note: See TracChangeset for help on using the changeset viewer.