[Lemon-commits] Akos Ladanyi: Makefile cleanup (see ticket #87)

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/4b42aa24ce12
changeset: 146:4b42aa24ce12
user:      Akos Ladanyi <ladanyi [at] tmit.bme.hu>
date:      Tue Apr 22 22:39:57 2008 +0200
description:
	Makefile cleanup (see ticket #87)

diffstat:

7 files changed, 7 insertions(+), 26 deletions(-)
Makefile.am           |   17 +++--------------
benchmark/Makefile.am |    3 ---
demo/Makefile.am      |    3 +--
doc/Makefile.am       |    1 -
lemon/Makefile.am     |    4 ++--
test/Makefile.am      |    2 +-
tools/Makefile.am     |    3 ---

diffs (94 lines):

diff -r 95d905b6e33d -r 4b42aa24ce12 Makefile.am
--- a/Makefile.am	Tue Apr 22 17:52:01 2008 +0100
+++ b/Makefile.am	Tue Apr 22 22:39:57 2008 +0200
@@ -7,7 +7,8 @@
 	LICENSE \
 	m4/lx_check_cplex.m4 \
 	m4/lx_check_glpk.m4 \
-	m4/lx_check_soplex.m4
+	m4/lx_check_soplex.m4 \
+	CMakeLists.txt
 
 pkgconfigdir = $(libdir)/pkgconfig
 lemondir = $(pkgincludedir)
@@ -44,13 +45,7 @@
 	build-aux/install-sh \
 	build-aux/ltmain.sh \
 	build-aux/missing \
-	doc/Makefile.in \
-	doc/doxygen.log \
-	Makefile.in \
-	lemon/Makefile.in \
-	test/Makefile.in \
-	benchmark/Makefile.in \
-	demo/Makefile.in
+	doc/doxygen.log
 
 mrproper:
 	$(MAKE) $(AM_MAKEFLAGS) maintainer-clean
diff -r 95d905b6e33d -r 4b42aa24ce12 benchmark/Makefile.am
--- a/benchmark/Makefile.am	Tue Apr 22 17:52:01 2008 +0100
+++ b/benchmark/Makefile.am	Tue Apr 22 22:39:57 2008 +0200
@@ -1,6 +1,3 @@
-EXTRA_DIST += \
-        benchmark/Makefile
-
 if WANT_BENCHMARK
 
 noinst_HEADERS +=
diff -r 95d905b6e33d -r 4b42aa24ce12 demo/Makefile.am
--- a/demo/Makefile.am	Tue Apr 22 17:52:01 2008 +0100
+++ b/demo/Makefile.am	Tue Apr 22 22:39:57 2008 +0200
@@ -1,5 +1,5 @@
 EXTRA_DIST += \
-	demo/Makefile
+	demo/CMakeLists.txt
 
 if WANT_DEMO
 
@@ -13,4 +13,3 @@
 demo_arg_parser_demo_SOURCES = demo/arg_parser_demo.cc
 demo_graph_to_eps_demo_SOURCES = demo/graph_to_eps_demo.cc
 demo_lgf_demo_SOURCES = demo/lgf_demo.cc
-
diff -r 95d905b6e33d -r 4b42aa24ce12 doc/Makefile.am
--- a/doc/Makefile.am	Tue Apr 22 17:52:01 2008 +0100
+++ b/doc/Makefile.am	Tue Apr 22 22:39:57 2008 +0200
@@ -1,5 +1,4 @@
 EXTRA_DIST += \
-	doc/Makefile \
 	doc/Doxyfile.in \
 	doc/coding_style.dox \
 	doc/dirs.dox \
diff -r 95d905b6e33d -r 4b42aa24ce12 lemon/Makefile.am
--- a/lemon/Makefile.am	Tue Apr 22 17:52:01 2008 +0100
+++ b/lemon/Makefile.am	Tue Apr 22 22:39:57 2008 +0200
@@ -1,6 +1,6 @@
 EXTRA_DIST += \
-	lemon/Makefile \
-	lemon/lemon.pc.in
+	lemon/lemon.pc.in \
+	lemon/CMakeLists.txt
 
 pkgconfig_DATA += lemon/lemon.pc
 
diff -r 95d905b6e33d -r 4b42aa24ce12 test/Makefile.am
--- a/test/Makefile.am	Tue Apr 22 17:52:01 2008 +0100
+++ b/test/Makefile.am	Tue Apr 22 22:39:57 2008 +0200
@@ -1,5 +1,5 @@
 EXTRA_DIST += \
-	test/Makefile
+	test/CMakeLists.txt
 
 noinst_HEADERS += \
 	test/digraph_test.h \
diff -r 95d905b6e33d -r 4b42aa24ce12 tools/Makefile.am
--- a/tools/Makefile.am	Tue Apr 22 17:52:01 2008 +0100
+++ b/tools/Makefile.am	Tue Apr 22 22:39:57 2008 +0200
@@ -1,6 +1,3 @@
-EXTRA_DIST += \
-	tools/Makefile
-
 if WANT_TOOLS
 
 bin_PROGRAMS +=