* data/Makefile.am (CLEANFILES): Add Makefile.template and Makefile.repository. * swig/python/Makefile.am (CLEANFILES) * test/Makefile.am (CLEANFILES): Add dyn.log. * test/wrappers/Makefile.am (CLEANFILES): Likewise. (clean-local): Depend on... (clean-repository): ...this new (phony) target. --- extatica/ChangeLog | 13 +++++++++++++ extatica/data/Makefile.am | 5 ++++- extatica/swig/python/Makefile.am | 3 +++ extatica/test/Makefile.am | 6 +++++- extatica/test/wrappers/Makefile.am | 10 +++++++++- 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index 52020be..a476bda 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,18 @@ 2010-11-08 Roland Levillain <roland@lrde.epita.fr> + Fix cleaning rules in Extatica. + + * data/Makefile.am (CLEANFILES): Add Makefile.template and + Makefile.repository. + * swig/python/Makefile.am (CLEANFILES) + * test/Makefile.am (CLEANFILES): + Add dyn.log. + * test/wrappers/Makefile.am (CLEANFILES): Likewise. + (clean-local): Depend on... + (clean-repository): ...this new (phony) target. + +2010-11-08 Roland Levillain <roland@lrde.epita.fr> + Generate Extatica's swig/python/config.py. * swig/python/config.py: Remove. diff --git a/extatica/data/Makefile.am b/extatica/data/Makefile.am index 698b1f8..a9d9d93 100644 --- a/extatica/data/Makefile.am +++ b/extatica/data/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2005, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2005, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -48,3 +49,5 @@ Makefile.repository: Makefile -e 's/^SUBDIRS = .*/SUBDIRS = $$(shell ls | grep -v Makefile)/' \ -e 's|^Makefile: |Makefile.old: |' \ -e 's|^VPATH = .*|VPATH = .|' | grep -v '^include ' > $@ + +CLEANFILES = Makefile.template Makefile.repository diff --git a/extatica/swig/python/Makefile.am b/extatica/swig/python/Makefile.am index c96c9e3..bef9788 100644 --- a/extatica/swig/python/Makefile.am +++ b/extatica/swig/python/Makefile.am @@ -149,6 +149,9 @@ TESTS = milena-libdyn.py milena-libdynmilena.py # FIXME: Is this really needed? EXTRA_DIST += $(TESTS) +# Log produced by libdyn. +CLEANFILES += dyn.log + clean-local: clean-repository .PHONY: clean-repository clean-repository: diff --git a/extatica/test/Makefile.am b/extatica/test/Makefile.am index e0301a6..a8028d8 100644 --- a/extatica/test/Makefile.am +++ b/extatica/test/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2005, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2005, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -78,6 +79,9 @@ TESTS = $(check_PROGRAMS) tests: $(check_PROGRAMS) +# Log produced by libdyn. +CLEANFILES = dyn.log + clean-local: clean-repository .PHONY: clean-repository clean-repository: diff --git a/extatica/test/wrappers/Makefile.am b/extatica/test/wrappers/Makefile.am index d947ea2..56097c1 100644 --- a/extatica/test/wrappers/Makefile.am +++ b/extatica/test/wrappers/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -23,3 +23,11 @@ check_PROGRAMS = test-milena test_milena_SOURCES = test-milena.cc TESTS = $(check_PROGRAMS) + +# Log produced by libdyn. +CLEANFILES = dyn.log + +clean-local: clean-repository +.PHONY: clean-repository +clean-repository: + -rm -rf repository -- 1.5.6.5