Merge bugfix #280 1.0
authorAlpar Juttner <alpar@cs.elte.hu>
Wed, 29 Apr 2009 16:49:52 +0100
branch1.0
changeset 544673c9d6bef44
parent 542 7f4536948929
parent 543 32fb28fc9d42
child 545 2c95c34b1e9e
Merge bugfix #280
     1.1 --- a/lemon/Makefile.am	Tue Apr 28 13:55:44 2009 +0100
     1.2 +++ b/lemon/Makefile.am	Wed Apr 29 16:49:52 2009 +0100
     1.3 @@ -16,6 +16,8 @@
     1.4  #lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
     1.5  #lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
     1.6  
     1.7 +nodist_lemon_HEADERS = lemon/config.h
     1.8 +
     1.9  lemon_HEADERS += \
    1.10          lemon/arg_parser.h \
    1.11  	lemon/assert.h \
    1.12 @@ -23,7 +25,6 @@
    1.13          lemon/bin_heap.h \
    1.14          lemon/color.h \
    1.15  	lemon/concept_check.h \
    1.16 -	lemon/config.h \
    1.17          lemon/counter.h \
    1.18  	lemon/core.h \
    1.19          lemon/dfs.h \
     2.1 --- a/lemon/core.h	Tue Apr 28 13:55:44 2009 +0100
     2.2 +++ b/lemon/core.h	Wed Apr 29 16:49:52 2009 +0100
     2.3 @@ -22,7 +22,7 @@
     2.4  #include <vector>
     2.5  #include <algorithm>
     2.6  
     2.7 -#include <lemon/core.h>
     2.8 +#include <lemon/config.h>
     2.9  #include <lemon/bits/enable_if.h>
    2.10  #include <lemon/bits/traits.h>
    2.11  #include <lemon/assert.h>