* Makefile.am ($(srcdir)/headers.mk): Move action...
(regen-dist): ...here.
Remove any dependency.
($(srcdir)/headers.mk): Delegate action to rule regen-dist.
---
milena/ChangeLog | 9 +++++++++
milena/Makefile.am | 5 +++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 40b184b..974b11a 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-15 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Fix the manual regeneration of headers.mk.
+
+ * Makefile.am ($(srcdir)/headers.mk): Move action...
+ (regen-dist): ...here.
+ Remove any dependency.
+ ($(srcdir)/headers.mk): Delegate action to rule regen-dist.
+
2009-05-14 Roland Levillain <roland(a)lrde.epita.fr>
Improve the portability of mesh/Makefile.
diff --git a/milena/Makefile.am b/milena/Makefile.am
index e186158..e82862f 100644
--- a/milena/Makefile.am
+++ b/milena/Makefile.am
@@ -25,14 +25,15 @@ tools:
$(MAKE) -C tools all
.PHONY: regen-dist
-regen-dist: $(srcdir)/headers.mk
+regen-dist:
+ cd $(srcdir) && ./generate_dist_headers.sh && chmod -w headers.mk
# FIXME: Change generate_dist_headers.sh so that the action looks like this:
#
# $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@
#
EXTRA_DIST = generate_dist_headers.sh
$(srcdir)/headers.mk: $(srcdir)/generate_dist_headers.sh
- cd $(srcdir) && ./generate_dist_headers.sh && chmod -w headers.mk
+ $(MAKE) $(AM_MAKEFLAGS) regen-dist
include $(srcdir)/headers.mk
--
1.6.1.2
Show replies by date