Ignore:
Timestamp:
Mar 5, 2011 11:30:34 AM (10 years ago)
Author:
stefan
Message:

make amd.h accessible to library users; rerun autotools

File:
1 edited

Legend:

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

    r2081 r2118  
    5959        $(top_srcdir)/configure config.guess config.sub depcomp \
    6060        install-sh ltmain.sh missing
    61 @HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    62 @HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
     61@HAVE_EXTERNALS_TRUE@am__append_1 = Dependencies
     62@HAVE_EXTERNALS_TRUE@am__append_2 = .Dependencies-stamp
    6363subdir = .
    6464ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    400400libcoinglpk_la_LDFLAGS = $(LT_LDFLAGS)
    401401thirdpartyincludedir = $(includedir)/coin/ThirdParty
    402 thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h
     402thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h $(GLPKDIR)/src/amd/amd.h
    403403pkgconfiglibdir = $(libdir)/pkgconfig
    404404pkgconfiglib_DATA = coinglpk.pc
     
    14891489        $(am__remove_distdir)
    14901490        mkdir $(distdir)
    1491         $(mkdir_p) $(distdir)/$(GLPKDIR)/include $(distdir)/. $(distdir)/BuildTools
     1491        $(mkdir_p) $(distdir)/$(GLPKDIR)/include $(distdir)/$(GLPKDIR)/src/amd $(distdir)/. $(distdir)/BuildTools
    14921492        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    14931493        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    17621762@MAINTAINER_MODE_TRUE@  cp $< $@
    17631763
    1764 # Take care of updating externals (if Externals file exists)
    1765 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Externals-stamp
    1766 
    1767 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Externals-stamp: $(srcdir)/Externals
    1768 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn propset svn:externals -F Externals .
    1769 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Externals-stamp
    1770 
    1771 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp
     1764# Take care of updating externals (if Dependencies file exists)
     1765@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Dependencies-stamp
     1766
     1767@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Dependencies-stamp: $(srcdir)/Dependencies
     1768@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); BuildTools/set_externals Dependencies
     1769@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Dependencies-stamp
     1770
     1771@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Dependencies-stamp
    17721772@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn update
    17731773
Note: See TracChangeset for help on using the changeset viewer.