Ignore:
Timestamp:
Nov 20, 2012 10:30:18 AM (7 years ago)
Author:
stefan
Message:

support glpk 4.47 now

File:
1 edited

Legend:

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

    r2118 r2639  
    3333$(GLPKDIR)/src/glpapi18.c \
    3434$(GLPKDIR)/src/glpapi19.c \
     35$(GLPKDIR)/src/glpapi20.c \
     36$(GLPKDIR)/src/glpapi21.c \
    3537$(GLPKDIR)/src/glpavl.c \
    3638$(GLPKDIR)/src/glpbfd.c \
     
    9698$(GLPKDIR)/src/glpnpp04.c \
    9799$(GLPKDIR)/src/glpnpp05.c \
     100$(GLPKDIR)/src/glpnpp06.c \
    98101$(GLPKDIR)/src/glpqmd.c \
    99102$(GLPKDIR)/src/glprgr.c \
     
    121124$(GLPKDIR)/src/amd/amd_preprocess.c \
    122125$(GLPKDIR)/src/amd/amd_valid.c \
    123 $(GLPKDIR)/src/colamd/colamd.c
     126$(GLPKDIR)/src/colamd/colamd.c \
     127$(GLPKDIR)/src/minisat/minisat.c \
     128$(GLPKDIR)/src/zlib/adler32.c \
     129$(GLPKDIR)/src/zlib/compress.c \
     130$(GLPKDIR)/src/zlib/crc32.c \
     131$(GLPKDIR)/src/zlib/deflate.c \
     132$(GLPKDIR)/src/zlib/gzclose.c \
     133$(GLPKDIR)/src/zlib/gzlib.c \
     134$(GLPKDIR)/src/zlib/gzread.c \
     135$(GLPKDIR)/src/zlib/gzwrite.c \
     136$(GLPKDIR)/src/zlib/infback.c \
     137$(GLPKDIR)/src/zlib/inffast.c \
     138$(GLPKDIR)/src/zlib/inflate.c \
     139$(GLPKDIR)/src/zlib/inftrees.c \
     140$(GLPKDIR)/src/zlib/trees.c \
     141$(GLPKDIR)/src/zlib/uncompr.c \
     142$(GLPKDIR)/src/zlib/zio.c \
     143$(GLPKDIR)/src/zlib/zutil.c
    124144
    125145DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
    126146
    127 AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/$(GLPKDIR)/include` \
     147AM_CPPFLAGS = \
    128148  -I`$(CYGPATH_W) $(srcdir)/$(GLPKDIR)/src` \
    129149  -I`$(CYGPATH_W) $(srcdir)/$(GLPKDIR)/src/amd` \
    130150  -I`$(CYGPATH_W) $(srcdir)/$(GLPKDIR)/src/colamd` \
     151  -I`$(CYGPATH_W) $(srcdir)/$(GLPKDIR)/src/minisat` \
    131152  -I$(GLPKDIR)
    132153
     
    134155
    135156thirdpartyincludedir = $(includedir)/coin/ThirdParty
    136 thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h $(GLPKDIR)/src/amd/amd.h
     157thirdpartyinclude_HEADERS = $(GLPKDIR)/src/glpk.h $(GLPKDIR)/src/amd/amd.h
    137158
    138159pkgconfiglibdir = $(libdir)/pkgconfig
Note: See TracChangeset for help on using the changeset viewer.