# HG changeset patch # User Alpar Juttner # Date 1241020527 -3600 # Node ID 72ac25ad276e2ff9617ed7d44cd4b6dcbbf85137 # Parent 57e6f560fb134b8db6eacb1d0654ef78ebcfabb2# Parent 32fb28fc9d4298c95033cd2d41e634757d6952b4 Merge diff -r 57e6f560fb13 -r 72ac25ad276e lemon/Makefile.am --- a/lemon/Makefile.am Tue Apr 28 11:25:47 2009 +0100 +++ b/lemon/Makefile.am Wed Apr 29 16:55:27 2009 +0100 @@ -15,7 +15,8 @@ lemon/random.cc \ lemon/bits/windows.cc - +nodist_lemon_HEADERS = lemon/config.h + lemon_libemon_la_CXXFLAGS = \ $(AM_CXXFLAGS) \ $(GLPK_CFLAGS) \ @@ -62,7 +63,6 @@ lemon/clp.h \ lemon/color.h \ lemon/concept_check.h \ - lemon/config.h \ lemon/connectivity.h \ lemon/counter.h \ lemon/core.h \ diff -r 57e6f560fb13 -r 72ac25ad276e lemon/core.h --- a/lemon/core.h Tue Apr 28 11:25:47 2009 +0100 +++ b/lemon/core.h Wed Apr 29 16:55:27 2009 +0100 @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include