diff -r e1055232c670 -r f2c532541730 lemon/Makefile.am
--- a/lemon/Makefile.am	Thu Jun 22 15:16:11 2006 +0000
+++ b/lemon/Makefile.am	Thu Jun 22 18:20:25 2006 +0000
@@ -1,117 +1,118 @@
-AM_CPPFLAGS = -I$(top_srcdir)
+pkgconfig_DATA += lemon/lemon.pc
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = lemon.pc
+lib_LTLIBRARIES += lemon/libemon.la
 
-lib_LTLIBRARIES = libemon.la
+lemon_libemon_la_SOURCES = \
+	lemon/lp_base.cc \
+	lemon/lp_skeleton.cc \
+	lemon/base.cc \
+	lemon/eps.cc \
+	lemon/bits/mingw32_rand.cc \
+	lemon/bits/mingw32_time.cc
 
-libemon_la_SOURCES = \
-	lp_base.cc \
-	lp_skeleton.cc \
-	base.cc \
-	eps.cc \
-	bits/mingw32_rand.cc \
-	bits/mingw32_time.cc
-
-libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
-libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS)
+lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS)
+lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS)
 
 if HAVE_GLPK
-libemon_la_SOURCES += lp_glpk.cc
+lemon_libemon_la_SOURCES += lemon/lp_glpk.cc
 endif
 
 if HAVE_CPLEX
-libemon_la_SOURCES += lp_cplex.cc
+lemon_libemon_la_SOURCES += lemon/lp_cplex.cc
 endif
 
-nobase_pkginclude_HEADERS = \
-	bellman_ford.h \
-	bezier.h \
-	bfs.h \
-	bin_heap.h \
-	bipartite_matching.h \
-	bits/alteration_notifier.h \
-	bits/array_map.h \
-	bits/base_extender.h \
-	bits/default_map.h \
-	bits/edge_set_extender.h \
-	bits/graph_adaptor_extender.h \
-	bits/graph_extender.h \
-	bits/invalid.h \
-	bits/item_reader.h \
-	bits/item_writer.h \
-	bits/map_extender.h \
-	bits/mingw32_rand.h \
-	bits/mingw32_time.h \
-	bits/traits.h \
-	bits/utility.h \
-	bits/vector_map.h \
-	bpugraph_adaptor.h \
-	bucket_heap.h \
-	color.h \
-	concept_check.h \
-	concept/bpugraph.h \
-	concept/graph.h \
-	concept/graph_component.h \
-	concept/heap.h \
-	concept/maps.h \
-	concept/matrix_maps.h \
-	concept/path.h \
-	concept/ugraph.h \
-	config.h \
-	counter.h \
-	dag_shortest_path.h \
-	dfs.h \
-	dijkstra.h \
-	dimacs.h \
-	edge_set.h \
-	edmonds_karp.h \
-	eps.h \
-	error.h \
-	fib_heap.h \
-	floyd_warshall.h \
-	fredman_tarjan.h \
-	full_graph.h \
-	graph_adaptor.h \
-	graph_reader.h \
-	graph_to_eps.h \
-	graph_utils.h \
-	graph_writer.h \
-	grid_ugraph.h \
-	hypercube_graph.h \
-	iterable_maps.h \
-	johnson.h \
-	kruskal.h \
-	lemon_reader.h \
-	lemon_writer.h \
-	list_graph.h \
-	lp.h \
-	lp_base.h \
-	lp_cplex.h \
-	lp_glpk.h \
-	lp_skeleton.h \
-	map_iterator.h \
-	maps.h \
-	matrix_maps.h \
-	max_matching.h \
-	min_cost_arborescence.h \
-	min_cost_flow.h \
-	min_cut.h \
-	path.h \
-	polynomial.h \
-	preflow.h \
-	prim.h \
-	radix_heap.h \
-	radix_sort.h \
-	refptr.h \
-	simann.h \
-	smart_graph.h \
-	sub_graph.h \
-	suurballe.h \
-	tabu_search.h \
-	time_measure.h \
-	tolerance.h \
-	topology.h \
-	ugraph_adaptor.h \
-	unionfind.h \
-	xy.h
+lemon_HEADERS += \
+	lemon/bellman_ford.h \
+	lemon/bezier.h \
+	lemon/bfs.h \
+	lemon/bin_heap.h \
+	lemon/bipartite_matching.h \
+	lemon/bpugraph_adaptor.h \
+	lemon/bucket_heap.h \
+	lemon/color.h \
+	lemon/config.h \
+	lemon/counter.h \
+	lemon/dag_shortest_path.h \
+	lemon/dfs.h \
+	lemon/dijkstra.h \
+	lemon/dimacs.h \
+	lemon/edge_set.h \
+	lemon/edmonds_karp.h \
+	lemon/eps.h \
+	lemon/error.h \
+	lemon/fib_heap.h \
+	lemon/floyd_warshall.h \
+	lemon/fredman_tarjan.h \
+	lemon/full_graph.h \
+	lemon/graph_adaptor.h \
+	lemon/graph_reader.h \
+	lemon/graph_to_eps.h \
+	lemon/graph_utils.h \
+	lemon/graph_writer.h \
+	lemon/grid_ugraph.h \
+	lemon/hypercube_graph.h \
+	lemon/iterable_maps.h \
+	lemon/johnson.h \
+	lemon/kruskal.h \
+	lemon/lemon_reader.h \
+	lemon/lemon_writer.h \
+	lemon/list_graph.h \
+	lemon/lp.h \
+	lemon/lp_base.h \
+	lemon/lp_cplex.h \
+	lemon/lp_glpk.h \
+	lemon/lp_skeleton.h \
+	lemon/map_iterator.h \
+	lemon/maps.h \
+	lemon/matrix_maps.h \
+	lemon/max_matching.h \
+	lemon/min_cost_arborescence.h \
+	lemon/min_cost_flow.h \
+	lemon/min_cut.h \
+	lemon/path.h \
+	lemon/polynomial.h \
+	lemon/preflow.h \
+	lemon/prim.h \
+	lemon/radix_heap.h \
+	lemon/radix_sort.h \
+	lemon/refptr.h \
+	lemon/simann.h \
+	lemon/smart_graph.h \
+	lemon/sub_graph.h \
+	lemon/suurballe.h \
+	lemon/tabu_search.h \
+	lemon/time_measure.h \
+	lemon/tolerance.h \
+	lemon/topology.h \
+	lemon/ugraph_adaptor.h \
+	lemon/unionfind.h \
+	lemon/xy.h
+
+bits_HEADERS += \
+	lemon/bits/alteration_notifier.h \
+	lemon/bits/array_map.h \
+	lemon/bits/base_extender.h \
+	lemon/bits/default_map.h \
+	lemon/bits/edge_set_extender.h \
+	lemon/bits/graph_adaptor_extender.h \
+	lemon/bits/graph_extender.h \
+	lemon/bits/invalid.h \
+	lemon/bits/item_reader.h \
+	lemon/bits/item_writer.h \
+	lemon/bits/map_extender.h \
+	lemon/bits/mingw32_rand.h \
+	lemon/bits/mingw32_time.h \
+	lemon/bits/traits.h \
+	lemon/bits/utility.h \
+	lemon/bits/vector_map.h
+
+concept_HEADERS += \
+	lemon/concept_check.h \
+	lemon/concept/bpugraph.h \
+	lemon/concept/graph.h \
+	lemon/concept/graph_component.h \
+	lemon/concept/heap.h \
+	lemon/concept/maps.h \
+	lemon/concept/matrix_maps.h \
+	lemon/concept/path.h \
+	lemon/concept/ugraph.h