Changeset 2639 for ThirdParty/Glpk/trunk/Makefile.am

Timestamp:

Nov 20, 2012 10:30:18 AM (7 years ago)

Author:

stefan

Message:

support glpk 4.47 now

File:

• ThirdParty/Glpk/trunk/Makefile.am (modified) (4 diffs)

ThirdParty/Glpk/trunk/Makefile.am

@@ -33 +33 @@
 $(GLPKDIR)/src/glpapi18.c \
 $(GLPKDIR)/src/glpapi19.c \
+$(GLPKDIR)/src/glpapi20.c \
+$(GLPKDIR)/src/glpapi21.c \
 $(GLPKDIR)/src/glpavl.c \
 $(GLPKDIR)/src/glpbfd.c \
@@ -96 +98 @@
 $(GLPKDIR)/src/glpnpp04.c \
 $(GLPKDIR)/src/glpnpp05.c \
+$(GLPKDIR)/src/glpnpp06.c \
 $(GLPKDIR)/src/glpqmd.c \
 $(GLPKDIR)/src/glprgr.c \
@@ -121 +124 @@
 $(GLPKDIR)/src/amd/amd_preprocess.c \
 $(GLPKDIR)/src/amd/amd_valid.c \
-$(GLPKDIR)/src/colamd/colamd.c
+$(GLPKDIR)/src/colamd/colamd.c \
+$(GLPKDIR)/src/minisat/minisat.c \
+$(GLPKDIR)/src/zlib/adler32.c \
+$(GLPKDIR)/src/zlib/compress.c \
+$(GLPKDIR)/src/zlib/crc32.c \
+$(GLPKDIR)/src/zlib/deflate.c \
+$(GLPKDIR)/src/zlib/gzclose.c \
+$(GLPKDIR)/src/zlib/gzlib.c \
+$(GLPKDIR)/src/zlib/gzread.c \
+$(GLPKDIR)/src/zlib/gzwrite.c \
+$(GLPKDIR)/src/zlib/infback.c \
+$(GLPKDIR)/src/zlib/inffast.c \
+$(GLPKDIR)/src/zlib/inflate.c \
+$(GLPKDIR)/src/zlib/inftrees.c \
+$(GLPKDIR)/src/zlib/trees.c \
+$(GLPKDIR)/src/zlib/uncompr.c \
+$(GLPKDIR)/src/zlib/zio.c \
+$(GLPKDIR)/src/zlib/zutil.c
 
 DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
 
-AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/$(GLPKDIR)/include` \
+AM_CPPFLAGS = \
   -I`$(CYGPATH_W) $(srcdir)/$(GLPKDIR)/src` \
   -I`$(CYGPATH_W) $(srcdir)/$(GLPKDIR)/src/amd` \
   -I`$(CYGPATH_W) $(srcdir)/$(GLPKDIR)/src/colamd` \
+  -I`$(CYGPATH_W) $(srcdir)/$(GLPKDIR)/src/minisat` \
   -I$(GLPKDIR)
 
@@ -134 +155 @@
 
 thirdpartyincludedir = $(includedir)/coin/ThirdParty
-thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h $(GLPKDIR)/src/amd/amd.h
+thirdpartyinclude_HEADERS = $(GLPKDIR)/src/glpk.h $(GLPKDIR)/src/amd/amd.h
 
 pkgconfiglibdir = $(libdir)/pkgconfig