Changeset 1498 for ThirdParty/Glpk


Ignore:
Timestamp:
Mar 14, 2010 11:40:35 AM (11 years ago)
Author:
stefan
Message:

remove workarounds for projects that include private Glpk headers

Location:
ThirdParty/Glpk/branches/split
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/branches/split/Makefile.am

    r1485 r1498  
    124124$(GLPKDIR)/src/colamd/colamd.c
    125125
    126 # CoinUtils and SYMPHONY include glpmpl.h, have HAVE_CONFIG_H defined,
    127 # and so Glpk attempts to include config.h.
    128 # Therefore, we put a simple config.h file into $(GLPKDIR)/include.
    129 # It's purpose is to include the config_glpk.h file that is generated
    130 # by configure.
    131 libcoinglpk_la_DEPENDENCIES = $(srcdir)/$(GLPKDIR)/include/config.h \
    132   $(srcdir)/$(GLPKDIR)/include/glpmpl.h \
    133   $(srcdir)/$(GLPKDIR)/include/glpavl.h \
    134   $(srcdir)/$(GLPKDIR)/include/glprng.h \
    135   $(srcdir)/$(GLPKDIR)/include/glpdmp.h \
    136   $(srcdir)/$(GLPKDIR)/include/glpenv.h \
    137   $(srcdir)/$(GLPKDIR)/include/glplib.h \
    138   $(srcdir)/$(GLPKDIR)/include/glpstd.h
    139 
    140 $(srcdir)/$(GLPKDIR)/include/config.h : $(srcdir)/config.h
    141         cp $(srcdir)/config.h $(srcdir)/$(GLPKDIR)/include/config.h
    142 
    143 $(srcdir)/$(GLPKDIR)/include/glpmpl.h : $(srcdir)/$(GLPKDIR)/src/glpmpl.h
    144         cp $(srcdir)/$(GLPKDIR)/src/glpmpl.h $(srcdir)/$(GLPKDIR)/include/glpmpl.h
    145 
    146 $(srcdir)/$(GLPKDIR)/include/glpavl.h : $(srcdir)/$(GLPKDIR)/src/glpavl.h
    147         cp $(srcdir)/$(GLPKDIR)/src/glpavl.h $(srcdir)/$(GLPKDIR)/include/glpavl.h
    148 
    149 $(srcdir)/$(GLPKDIR)/include/glprng.h : $(srcdir)/$(GLPKDIR)/src/glprng.h
    150         cp $(srcdir)/$(GLPKDIR)/src/glprng.h $(srcdir)/$(GLPKDIR)/include/glprng.h
    151 
    152 $(srcdir)/$(GLPKDIR)/include/glpdmp.h : $(srcdir)/$(GLPKDIR)/src/glpdmp.h
    153         cp $(srcdir)/$(GLPKDIR)/src/glpdmp.h $(srcdir)/$(GLPKDIR)/include/glpdmp.h
    154 
    155 $(srcdir)/$(GLPKDIR)/include/glpenv.h : $(srcdir)/$(GLPKDIR)/src/glpenv.h
    156         cp $(srcdir)/$(GLPKDIR)/src/glpenv.h $(srcdir)/$(GLPKDIR)/include/glpenv.h
    157 
    158 $(srcdir)/$(GLPKDIR)/include/glplib.h : $(srcdir)/$(GLPKDIR)/src/glplib.h
    159         cp $(srcdir)/$(GLPKDIR)/src/glplib.h $(srcdir)/$(GLPKDIR)/include/glplib.h
    160 
    161 $(srcdir)/$(GLPKDIR)/include/glpstd.h : $(srcdir)/$(GLPKDIR)/src/glpstd.h
    162         cp $(srcdir)/$(GLPKDIR)/src/glpstd.h $(srcdir)/$(GLPKDIR)/include/glpstd.h
    163 
    164126DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
    165127
  • ThirdParty/Glpk/branches/split/Makefile.in

    r1485 r1498  
    389389$(GLPKDIR)/src/colamd/colamd.c
    390390
    391 
    392 # CoinUtils and SYMPHONY include glpmpl.h, have HAVE_CONFIG_H defined,
    393 # and so Glpk attempts to include config.h.
    394 # Therefore, we put a simple config.h file into $(GLPKDIR)/include.
    395 # It's purpose is to include the config_glpk.h file that is generated
    396 # by configure.
    397 libcoinglpk_la_DEPENDENCIES = $(srcdir)/$(GLPKDIR)/include/config.h \
    398   $(srcdir)/$(GLPKDIR)/include/glpmpl.h \
    399   $(srcdir)/$(GLPKDIR)/include/glpavl.h \
    400   $(srcdir)/$(GLPKDIR)/include/glprng.h \
    401   $(srcdir)/$(GLPKDIR)/include/glpdmp.h \
    402   $(srcdir)/$(GLPKDIR)/include/glpenv.h \
    403   $(srcdir)/$(GLPKDIR)/include/glplib.h \
    404   $(srcdir)/$(GLPKDIR)/include/glpstd.h
    405 
    406391DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
    407392AM_CPPFLAGS = -I`$(CYGPATH_W) $(srcdir)/$(GLPKDIR)/include` \
     
    17561741
    17571742
    1758 $(srcdir)/$(GLPKDIR)/include/config.h : $(srcdir)/config.h
    1759         cp $(srcdir)/config.h $(srcdir)/$(GLPKDIR)/include/config.h
    1760 
    1761 $(srcdir)/$(GLPKDIR)/include/glpmpl.h : $(srcdir)/$(GLPKDIR)/src/glpmpl.h
    1762         cp $(srcdir)/$(GLPKDIR)/src/glpmpl.h $(srcdir)/$(GLPKDIR)/include/glpmpl.h
    1763 
    1764 $(srcdir)/$(GLPKDIR)/include/glpavl.h : $(srcdir)/$(GLPKDIR)/src/glpavl.h
    1765         cp $(srcdir)/$(GLPKDIR)/src/glpavl.h $(srcdir)/$(GLPKDIR)/include/glpavl.h
    1766 
    1767 $(srcdir)/$(GLPKDIR)/include/glprng.h : $(srcdir)/$(GLPKDIR)/src/glprng.h
    1768         cp $(srcdir)/$(GLPKDIR)/src/glprng.h $(srcdir)/$(GLPKDIR)/include/glprng.h
    1769 
    1770 $(srcdir)/$(GLPKDIR)/include/glpdmp.h : $(srcdir)/$(GLPKDIR)/src/glpdmp.h
    1771         cp $(srcdir)/$(GLPKDIR)/src/glpdmp.h $(srcdir)/$(GLPKDIR)/include/glpdmp.h
    1772 
    1773 $(srcdir)/$(GLPKDIR)/include/glpenv.h : $(srcdir)/$(GLPKDIR)/src/glpenv.h
    1774         cp $(srcdir)/$(GLPKDIR)/src/glpenv.h $(srcdir)/$(GLPKDIR)/include/glpenv.h
    1775 
    1776 $(srcdir)/$(GLPKDIR)/include/glplib.h : $(srcdir)/$(GLPKDIR)/src/glplib.h
    1777         cp $(srcdir)/$(GLPKDIR)/src/glplib.h $(srcdir)/$(GLPKDIR)/include/glplib.h
    1778 
    1779 $(srcdir)/$(GLPKDIR)/include/glpstd.h : $(srcdir)/$(GLPKDIR)/src/glpstd.h
    1780         cp $(srcdir)/$(GLPKDIR)/src/glpstd.h $(srcdir)/$(GLPKDIR)/include/glpstd.h
    1781 
    17821743install-doc: $(DocFiles)
    17831744        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
  • ThirdParty/Glpk/branches/split/configure

    r1490 r1498  
    1010#
    1111#
    12 # Copyright 2007-2009 Stefan Vigerske and others.
     12# Copyright 2007-2010 Stefan Vigerske and others.
    1313# All Rights Reserved.
    1414# This file is part of the open source package Coin which is distributed
     
    12141214
    12151215
    1216 Copyright 2007-2009 Stefan Vigerske and others.
     1216Copyright 2007-2010 Stefan Vigerske and others.
    12171217All Rights Reserved.
    12181218This file is part of the open source package Coin which is distributed
  • ThirdParty/Glpk/branches/split/configure.ac

    r1485 r1498  
    1 # Copyright (C) 2007-2009 Stefan Vigerske and others.
     1# Copyright (C) 2007-2010 Stefan Vigerske and others.
    22# All Rights Reserved.
    33# This file is distributed under the Common Public License.
     
    1414
    1515AC_COPYRIGHT([
    16 Copyright 2007-2009 Stefan Vigerske and others.
     16Copyright 2007-2010 Stefan Vigerske and others.
    1717All Rights Reserved.
    1818This file is part of the open source package Coin which is distributed
Note: See TracChangeset for help on using the changeset viewer.