gravatar
ladanyi@tmit.bme.hu
ladanyi@tmit.bme.hu
Do not distribute lemon/config.h and fix its bad include by core.h (#280)
0 2 0
default
2 files changed with 3 insertions and 2 deletions:
↑ Collapse diff ↑
Ignore white space 32 line context
... ...
@@ -3,40 +3,41 @@
3 3
	lemon/CMakeLists.txt
4 4

	
5 5
pkgconfig_DATA += lemon/lemon.pc
6 6

	
7 7
lib_LTLIBRARIES += lemon/libemon.la
8 8

	
9 9
lemon_libemon_la_SOURCES = \
10 10
        lemon/arg_parser.cc \
11 11
        lemon/base.cc \
12 12
        lemon/color.cc \
13 13
        lemon/random.cc \
14 14
	lemon/bits/windows.cc
15 15

	
16 16
#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS)
17 17
#lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
18 18

	
19
nodist_lemon_HEADERS = lemon/config.h
20

	
19 21
lemon_HEADERS += \
20 22
        lemon/arg_parser.h \
21 23
	lemon/assert.h \
22 24
        lemon/bfs.h \
23 25
        lemon/bin_heap.h \
24 26
        lemon/color.h \
25 27
	lemon/concept_check.h \
26
	lemon/config.h \
27 28
        lemon/counter.h \
28 29
	lemon/core.h \
29 30
        lemon/dfs.h \
30 31
        lemon/dijkstra.h \
31 32
        lemon/dim2.h \
32 33
	lemon/error.h \
33 34
        lemon/graph_to_eps.h \
34 35
	lemon/kruskal.h \
35 36
	lemon/lgf_reader.h \
36 37
	lemon/lgf_writer.h \
37 38
	lemon/list_graph.h \
38 39
	lemon/maps.h \
39 40
	lemon/math.h \
40 41
	lemon/path.h \
41 42
        lemon/random.h \
42 43
	lemon/smart_graph.h \
Ignore white space 6 line context
... ...
@@ -9,33 +9,33 @@
9 9
 * Permission to use, modify and distribute this software is granted
10 10
 * provided that this copyright notice appears in all copies. For
11 11
 * precise terms see the accompanying LICENSE file.
12 12
 *
13 13
 * This software is provided "AS IS" with no warranty of any kind,
14 14
 * express or implied, and with no claim as to its suitability for any
15 15
 * purpose.
16 16
 *
17 17
 */
18 18

	
19 19
#ifndef LEMON_CORE_H
20 20
#define LEMON_CORE_H
21 21

	
22 22
#include <vector>
23 23
#include <algorithm>
24 24

	
25
#include <lemon/core.h>
25
#include <lemon/config.h>
26 26
#include <lemon/bits/enable_if.h>
27 27
#include <lemon/bits/traits.h>
28 28
#include <lemon/assert.h>
29 29

	
30 30
///\file
31 31
///\brief LEMON core utilities.
32 32
///
33 33
///This header file contains core utilities for LEMON.
34 34
///It is automatically included by all graph types, therefore it usually
35 35
///do not have to be included directly.
36 36

	
37 37
namespace lemon {
38 38

	
39 39
  /// \brief Dummy type to make it easier to create invalid iterators.
40 40
  ///
41 41
  /// Dummy type to make it easier to create invalid iterators.
0 comments (0 inline)