Return to cddlib.patch CVS log

Up to [local] / OpenXM / src / ox_cdd

Annotation of OpenXM/src/ox_cdd/cddlib.patch, Revision 1.2

1.2     ! ohara       1: diff -cbBr Makefile.am.orig Makefile.am
        !             2: *** Makefile.am.orig   Sun Nov  9 19:37:30 2003
        !             3: --- Makefile.am        Tue Mar 20 10:50:47 2007
1.1       noro        4: ***************
1.2     ! ohara       5: *** 1,20 ****
        !             6: - ##############################################
        !             7: - # Site customizations:
        !             8: - #---------------------------------------------
        !             9: - # where is gmp?
        !            10: - #---------------------------------------------
        !            11: - # export gmpdir := $(PWD)/../gmp-4.1
        !            12: - export gmpdir := /usr/local
        !            13: - #---------------------------------------------
        !            14: - # where is gmp lib?
        !            15: - export gmplibdir = $(gmpdir)/lib
        !            16: - #---------------------------------------------
        !            17: - # where is gmp include?
        !            18: - #---------------------------------------------
        !            19: - # export gmpincludedir = $(gmpdir)
        !            20: - export gmpincludedir = $(gmpdir)/include
        !            21: - #---------------------------------------------
        !            22: - # End of site customization.
        !            23: - ##############################################
        !            24:   SUBDIRS      = lib-src src lib-src-gmp src-gmp
        !            25:   EXTRA_DIST   = examples/*.* examples-ine/*.* examples-ine3d/*.* examples-ml/*.* examples-ext/*.*
        !            26: --- 1,2 ----
        !            27: diff -cbBr Makefile.in.orig Makefile.in
        !            28: *** Makefile.in.orig   Mon Feb 12 20:33:31 2007
        !            29: --- Makefile.in        Tue Mar 20 10:50:38 2007
        !            30: ***************
        !            31: *** 398,418 ****
        !            32:        uninstall-info-recursive uninstall-recursive
        !            33:
        !            34:
        !            35: - ##############################################
        !            36: - # Site customizations:
        !            37: - #---------------------------------------------
        !            38: - # where is gmp?
        !            39: - #---------------------------------------------
        !            40: - # export gmpdir := $(PWD)/../gmp-4.1
        !            41: - export gmpdir := /usr/local
        !            42: - #---------------------------------------------
        !            43: - # where is gmp lib?
        !            44: - export gmplibdir = $(gmpdir)/lib
        !            45: - #---------------------------------------------
        !            46: - # where is gmp include?
        !            47: - #---------------------------------------------
        !            48: - # export gmpincludedir = $(gmpdir)
        !            49: - export gmpincludedir = $(gmpdir)/include
        !            50:   # Tell versions [3.59,3.63) of GNU make to not export all variables.
        !            51:   # Otherwise a system limit (for SysV at least) may be exceeded.
        !            52:   .NOEXPORT:
        !            53: --- 398,403 ----
        !            54: diff -cbBr lib-src-gmp/Makefile.am.orig lib-src-gmp/Makefile.am
        !            55: *** lib-src-gmp/Makefile.am.orig       Mon Jul 14 16:55:11 2003
        !            56: --- lib-src-gmp/Makefile.am    Tue Mar 20 10:49:27 2007
        !            57: ***************
        !            58: *** 27,31 ****
        !            59:   CC       = $(CXX)
        !            60:   CPPFLAGS = -DGMPRATIONAL
        !            61:   CXXFLAGS = -O3
        !            62: ! INCLUDES = -I$(gmpincludedir)
        !            63:
        !            64: --- 27,31 ----
        !            65:   CC       = $(CXX)
        !            66:   CPPFLAGS = -DGMPRATIONAL
        !            67:   CXXFLAGS = -O3
        !            68: ! INCLUDES = -I$(prefix)/include
        !            69:
        !            70: diff -cbBr lib-src-gmp/Makefile.in.orig lib-src-gmp/Makefile.in
        !            71: *** lib-src-gmp/Makefile.in.orig       Mon Feb 12 20:33:32 2007
        !            72: --- lib-src-gmp/Makefile.in    Tue Mar 20 10:51:25 2007
        !            73: ***************
        !            74: *** 106,112 ****
        !            75:
        !            76:   CPPFLAGS = -DGMPRATIONAL
        !            77:   CXXFLAGS = -O3
        !            78: ! INCLUDES = -I$(gmpincludedir)
        !            79:   subdir = lib-src-gmp
        !            80:   mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
        !            81:   CONFIG_CLEAN_FILES =
        !            82: --- 106,112 ----
        !            83:
        !            84:   CPPFLAGS = -DGMPRATIONAL
        !            85:   CXXFLAGS = -O3
        !            86: ! INCLUDES = -I$(prefix)/include
        !            87:   subdir = lib-src-gmp
        !            88:   mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
        !            89:   CONFIG_CLEAN_FILES =
        !            90: diff -cbBr src-gmp/Makefile.am.orig src-gmp/Makefile.am
        !            91: *** src-gmp/Makefile.am.orig   Fri Jul 29 03:32:51 2005
        !            92: --- src-gmp/Makefile.am        Tue Mar 20 10:46:19 2007
        !            93: ***************
        !            94: *** 31,38 ****
        !            95:
        !            96:   CC           = $(CXX)
        !            97:   LDADD        = ../lib-src-gmp/libcddgmp.a
        !            98: ! LDFLAGS      = -L$(gmplibdir)
        !            99: ! INCLUDES     = -I../lib-src-gmp
        !           100: ! INCLUDES    += -I$(gmpincludedir)
        !           101:   CPPFLAGS     = -DGMPRATIONAL
        !           102:   CXXFLAGS     = -O2
        !           103: --- 31,37 ----
        !           104:
        !           105:   CC           = $(CXX)
        !           106:   LDADD        = ../lib-src-gmp/libcddgmp.a
        !           107: ! LDFLAGS      = -L$(prefix)/lib
        !           108: ! INCLUDES     = -I../lib-src-gmp -I$(prefix)/include
        !           109:   CPPFLAGS     = -DGMPRATIONAL
        !           110:   CXXFLAGS     = -O2
        !           111: diff -cbBr src-gmp/Makefile.in.orig src-gmp/Makefile.in
        !           112: *** src-gmp/Makefile.in.orig   Mon Feb 12 20:33:32 2007
        !           113: --- src-gmp/Makefile.in        Tue Mar 20 10:51:30 2007
        !           114: ***************
        !           115: *** 109,116 ****
        !           116:   testlp2_gmp_SOURCES = testlp2.c
        !           117:   testlp3_gmp_SOURCES = testlp3.c
        !           118:   LDADD = ../lib-src-gmp/libcddgmp.a
        !           119: ! LDFLAGS = -L$(gmplibdir)
        !           120: ! INCLUDES = -I../lib-src-gmp -I$(gmpincludedir)
        !           121:   CPPFLAGS = -DGMPRATIONAL
        !           122:   CXXFLAGS = -O2
        !           123:   subdir = src-gmp
        !           124: --- 109,116 ----
        !           125:   testlp2_gmp_SOURCES = testlp2.c
        !           126:   testlp3_gmp_SOURCES = testlp3.c
        !           127:   LDADD = ../lib-src-gmp/libcddgmp.a
        !           128: ! LDFLAGS = -L$(prefix)/lib
        !           129: ! INCLUDES = -I../lib-src-gmp -I$(prefix)/include
        !           130:   CPPFLAGS = -DGMPRATIONAL
        !           131:   CXXFLAGS = -O2
        !           132:   subdir = src-gmp