[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
97-factored-texis.patch
From: |
Akim Demaille |
Subject: |
97-factored-texis.patch |
Date: |
Fri, 02 Mar 2001 00:27:05 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* automake.in (%required_targets, %dependencies): Add dvi, info,
dvi-am, info-am.
(@info, @dvi): Remove.
(&handle_texinfo, &handle_merge_targets): Adjust.
(&handle_factored_dependencies): Required targets are phony.
* texinfos.am: Build info, dvi, and the corresponding -am or
-recursive targets.
Index: Makefile.in
--- Makefile.in Thu, 01 Mar 2001 22:20:42 +0100 akim (am/h/16_Makefile.i 1.31
644)
+++ Makefile.in Thu, 01 Mar 2001 23:46:01 +0100 akim (am/h/16_Makefile.i 1.31
644)
@@ -495,10 +495,6 @@
-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
@echo "$(distdir).tar.gz is ready for distribution" | \
sed 'h;s/./=/g;p;x;p;x'
-info-am: $(INFO_DEPS)
-info: info-recursive
-dvi-am: $(DVIS)
-dvi: dvi-recursive
check-am: all-am
check: check-recursive
all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA)
@@ -544,6 +540,14 @@
distclean-am: clean-am distclean-generic distclean-tags
+dvi: dvi-recursive
+
+dvi-am: $(DVIS)
+
+info: info-recursive
+
+info-am: $(INFO_DEPS)
+
install-data-am: install-dist_pkgdataDATA install-dist_scriptDATA \
install-info-am
@$(NORMAL_INSTALL)
@@ -575,16 +579,16 @@
install install-am install-binSCRIPTS install-data \
install-data-am install-data-recursive install-dist_pkgdataDATA \
install-dist_scriptDATA install-exec install-exec-am \
- install-exec-recursive install-info-am install-recursive \
- install-strip installcheck installcheck-local \
- installcheck-recursive installdirs installdirs-am \
- installdirs-recursive maintainer-clean maintainer-clean-aminfo \
- maintainer-clean-generic maintainer-clean-recursive \
- maintainer-clean-vti mostlyclean mostlyclean-aminfo \
- mostlyclean-generic mostlyclean-recursive mostlyclean-vti tags \
- tags-recursive uninstall uninstall-am uninstall-binSCRIPTS \
- uninstall-dist_pkgdataDATA uninstall-dist_scriptDATA \
- uninstall-info uninstall-recursive
+ install-exec-recursive install-info-am install-man \
+ install-recursive install-strip installcheck installcheck-am \
+ installcheck-local installcheck-recursive installdirs \
+ installdirs-am installdirs-recursive maintainer-clean \
+ maintainer-clean-aminfo maintainer-clean-generic \
+ maintainer-clean-recursive maintainer-clean-vti mostlyclean \
+ mostlyclean-aminfo mostlyclean-generic mostlyclean-recursive \
+ mostlyclean-vti tags tags-recursive uninstall uninstall-am \
+ uninstall-binSCRIPTS uninstall-dist_pkgdataDATA \
+ uninstall-dist_scriptDATA uninstall-info uninstall-recursive
install-data-hook:
Index: automake.in
--- automake.in Thu, 01 Mar 2001 23:05:04 +0100 akim (am/f/39_automake.i 1.104
755)
+++ automake.in Thu, 01 Mar 2001 23:49:04 +0100 akim (am/f/39_automake.i 1.104
755)
@@ -394,11 +394,17 @@
my %required_targets =
(
'all' => 1,
+ 'dvi' => 1,
+ 'info' => 1,
'install' => 1,
'install-data' => 1,
'install-exec' => 1,
# FIXME: Not required, temporary hacks.
+ # Well, actually they are sort of required: the -recursive
+ # targets will run them anyway...
+ 'dvi-am' => 1,
+ 'info-am' => 1,
'install-data-am' => 1,
'install-exec-am' => 1,
'installcheck-am' => 1,
@@ -485,8 +491,6 @@
my %dist_dirs;
# List of dependencies for the obvious targets.
-my @info;
-my @dvi;
my @all;
my @check;
my @check_tests;
@@ -683,8 +687,6 @@ sub initialize_per_input ()
%dist_dirs = ();
# List of dependencies for the obvious targets.
- @info = ();
- @dvi = ();
@all = ();
@check = ();
@check_tests = ();
@@ -696,6 +698,12 @@ sub initialize_per_input ()
# in Makefile: keeping related stuff altogether.
%dependencies =
(
+ # Texinfoing.
+ 'dvi' => [],
+ 'dvi-am' => [],
+ 'info' => [],
+ 'info-am' => [],
+
# Installing/uninstalling.
'install-data-am' => [],
'install-exec-am' => [],
@@ -2847,8 +2855,6 @@ sub handle_texinfo
# get run twice during "make all".
unshift (@all, '$(INFO_DEPS)');
}
- push (@info, '$(INFO_DEPS)');
- push (@dvi, '$(DVIS)');
&define_variable ("INFO_DEPS", join (' ', @info_deps_list));
&define_variable ("DVIS", join (' ', @dvis_list));
@@ -3920,8 +3926,6 @@ sub handle_merge_targets
if dirname ($one_name) eq $relative_dir;
}
- &do_one_merge_target ('info', @info);
- &do_one_merge_target ('dvi', @dvi);
&do_check_merge_target;
if (defined $options{'no-installinfo'})
@@ -4181,6 +4185,9 @@ sub handle_factored_dependencies
. "\t" . '$(MAKE) $(AM_MAKEFLAGS) ' . "$_-hook\n");
}
}
+
+ # All the required targets are phony.
+ grep { &depend ('.PHONY', $_) } keys %required_targets;
# Actually output gathered targets.
foreach (sort target_cmp keys %dependencies)
Index: texinfos.am
--- texinfos.am Tue, 27 Feb 2001 20:24:10 +0100 akim (am/g/10_texinfos.a 1.11
644)
+++ texinfos.am Thu, 01 Mar 2001 23:38:01 +0100 akim (am/g/10_texinfos.a 1.11
644)
@@ -22,6 +22,14 @@
.dvi.ps:
$(DVIPS) $< -o $@
+.PHONY: info info-am dvi dvi-am
+?SUBDIRS?.PHONY info: info-recursive
+?SUBDIRS?.PHONY dvi: dvi-recursive
+?!SUBDIRS?info: info-am
+?!SUBDIRS?dvi: dvi-am
+info-am: $(INFO_DEPS)
+dvi-am: $(DVIS)
+
## Look in both . and srcdir because the info pages might have been
## rebuilt in the build directory. Can't cd to srcdir; that might
## break a possible install-sh reference.
Index: m4/Makefile.in
--- m4/Makefile.in Thu, 01 Mar 2001 22:20:42 +0100 akim (am/h/15_Makefile.i
1.23 644)
+++ m4/Makefile.in Thu, 01 Mar 2001 23:46:02 +0100 akim (am/h/15_Makefile.i
1.23 644)
@@ -145,10 +145,6 @@
|| exit 1; \
fi; \
done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
@@ -190,6 +186,14 @@
distclean-am: clean-am distclean-generic
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
install-data-am: install-m4dataDATA
install-exec-am:
@@ -211,8 +215,8 @@
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am info info-am install \
install-am install-data install-data-am install-exec \
- install-exec-am install-m4dataDATA install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ install-exec-am install-m4dataDATA install-man install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
uninstall uninstall-am uninstall-m4dataDATA
Index: tests/Makefile.in
--- tests/Makefile.in Thu, 01 Mar 2001 22:20:42 +0100 akim (am/h/14_Makefile.i
1.26 644)
+++ tests/Makefile.in Thu, 01 Mar 2001 23:46:02 +0100 akim (am/h/14_Makefile.i
1.26 644)
@@ -450,10 +450,6 @@
|| exit 1; \
fi; \
done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
@@ -495,6 +491,14 @@
distclean-am: clean-am distclean-generic distclean-local
+dvi:
+
+dvi-am:
+
+info:
+
+info-am:
+
install-data-am:
install-exec-am:
@@ -514,8 +518,8 @@
.PHONY: all all-am check check-TESTS check-am clean clean-generic \
distclean distclean-generic distclean-local distdir dvi dvi-am \
info info-am install install-am install-data install-data-am \
- install-exec install-exec-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ install-exec install-exec-am install-man install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
uninstall uninstall-am
- 97-factored-texis.patch,
Akim Demaille <=