+Mon Feb 5 14:58:58 1996 Tom Tromey <tromey@creche.cygnus.com>
+
+ * Makefile.am (maintainer-check): Expect only one ${...}.
+ * texinfos.am (install-info): Remove unneeded ${...}. From Jim
+ Meyering.
+
+ * automake.in (handle_configure): Only define CONFIG_HEADER if
+ $config_name.
+ ($seen_gettext): New variable.
+ (handle_subdirs): Do all gettext-related checking here.
+ (scan_configure): Just set $seen_gettext.
+ (handle_man_pages): Properly quote $(MANS).
+
Wed Jan 31 09:51:30 1996 Tom Tromey (tromey@gerbil.cygnus.com)
* depend.am: Don't use srcdir anywhere.
* automake.in (handle_libraries): Don't make .deps relative to
srcdir.
- (handle_options): Reocgnize no-dependencies.
+ (handle_options): Recognize no-dependencies.
* depend.am (MKDEP): From Jim Meyering: Do nothing if srcdir is
".". Properly quote regexp.
# Some simple checks:
# * syntax check with perl4 and perl5.
# * make sure the scripts don't use 'true'
-# * expect exactly two instance of '${...}'
+# * expect no instances of '${...}'
# These are only really guaranteed to work on my machine.
maintainer-check: automake
@PERL@ -c -w automake
echo "can't use 'true' in GNU Makefile" 1>&2; \
exit 1; \
else :; fi
- @if test `fgrep '$${' $(srcdir)/[a-z]*.am | wc -l` -ne 2; then \
+ @if test `fgrep '$${' $(srcdir)/[a-z]*.am | wc -l` -ne 0; then \
echo "found too many uses of '\$${'" 1>&2; \
exit 1; \
fi
# Some simple checks:
# * syntax check with perl4 and perl5.
# * make sure the scripts don't use 'true'
-# * expect exactly two instance of '${...}'
+# * expect no instances of '${...}'
# These are only really guaranteed to work on my machine.
maintainer-check: automake
@PERL@ -c -w automake
echo "can't use 'true' in GNU Makefile" 1>&2; \
exit 1; \
else :; fi
- @if test `fgrep '$${' $(srcdir)/[a-z]*.am | wc -l` -ne 2; then \
+ @if test `fgrep '$${' $(srcdir)/[a-z]*.am | wc -l` -ne 0; then \
echo "found too many uses of '\$${'" 1>&2; \
exit 1; \
fi
po directory can use a Makefile.in.am (and generate Makefile.in.in)
Should 'distclean' remove $(SCRIPTS)?
-Should 'maintainer-clean' do "rm -rf .deps"?
+'maintainer-clean' should "rm -rf .deps". Ditto distclean
Should look for clean-local targets in Makefile.am.
If 'foo' is in SCRIPTS, and 'foo.in' exists, generate code to rebuild
# Whether AC_PROG_MAKE_SET has been seen in configure.in.
$seen_make_set = 0;
+# Whether ud_GNU_GETTEXT has been seen in configure.in.
+$seen_gettext = 0;
+
\f
&initialize_global_constants;
$output_vars .= "MANS = " . $contents{'man_MANS'} . "\n";
# Generate list of install dirs.
- $output_rules .= "install-man: $(MANS)\n";
+ $output_rules .= "install-man: \$(MANS)\n";
foreach (keys %sections)
{
push (@installdirs, '$(mandir)/man' . $_);
# Handle subdirectories.
sub handle_subdirs
{
+ if (! defined $contents{'SUBDIRS'})
+ {
+ &am_conf_error
+ ("ud_GNU_GETTEXT in configure.in but SUBDIRS not defined")
+ if $seen_gettext && $relative_dir eq '.';
+ return;
+ }
+
+ &am_conf_error
+ ("ud_GNU_GETTEXT in configure.in but \`po' not in SUBDIRS")
+ if $contents{'SUBDIRS'} !~ /\bpo\b/;
+ &am_conf_error
+ ("ud_GNU_GETTEXT in configure.in but \`intl' not in SUBDIRS")
+ if $contents{'SUBDIRS'} !~ /\bintl\b/;
+
+ &require_file ($NORMAL, 'ABOUT-NLS');
+
return if ! defined $contents{'SUBDIRS'};
$output_rules .= &file_contents ('subdirs');
# Generate CONFIG_HEADER define, and define interally.
$output_vars .= "CONFIG_HEADER = ${top_builddir}/${config_name}\n"
if $config_name;
- $contents{'CONFIG_HEADER'} = "${top_builddir}/${config_name}";
+ $contents{'CONFIG_HEADER'} = "${top_builddir}/${config_name}"
+ if $config_name;
}
# Handle C headers.
# Check for NLS support.
if (/ud_GNU_GETTEXT/)
{
- if (! defined $contents{'SUBDIRS'})
- {
- &am_conf_error
- ("ud_GNU_GETTEXT in configure.in but SUBDIRS not defined");
- }
- else
- {
- &am_conf_error
- ("ud_GNU_GETTEXT in configure.in but \`po' not in SUBDIRS")
- if $contents{'SUBDIRS'} !~ /\bpo\b/;
- &am_conf_error
- ("ud_GNU_GETTEXT in configure.in but \`intl' not in SUBDIRS")
- if $contents{'SUBDIRS'} !~ /\bintl\b/;
- }
-
- &require_file ($NORMAL, 'ABOUT-NLS');
+ $seen_gettext = 1;
}
# Handle configuration headers.
# Some simple checks:
# * syntax check with perl4 and perl5.
# * make sure the scripts don't use 'true'
-# * expect exactly two instance of '${...}'
+# * expect no instances of '${...}'
# These are only really guaranteed to work on my machine.
maintainer-check: automake
@PERL@ -c -w automake
echo "can't use 'true' in GNU Makefile" 1>&2; \
exit 1; \
else :; fi
- @if test `fgrep '$${' $(srcdir)/[a-z]*.am | wc -l` -ne 2; then \
+ @if test `fgrep '$${' $(srcdir)/[a-z]*.am | wc -l` -ne 0; then \
echo "found too many uses of '\$${'" 1>&2; \
exit 1; \
fi
install-info: $(INFO_DEPS)
$(top_srcdir)/mkinstalldirs $(infodir)
for file in $(INFO_DEPS); do \
-## This ${...} is in the shell, not in make. We use these strange
-## circumlocutions because we want the "ifile" to be relative, for the
-## install.
- for ifile in `cd $(srcdir) && echo $${file}*`; do \
+## We use these strange circumlocutions because we want the "ifile" to
+## be relative, for the install.
+ for ifile in `cd $(srcdir) && echo $$file*`; do \
$(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
done; \
## We need the 'else' because in some broken versions of sh 'if' will
install-info: $(INFO_DEPS)
$(top_srcdir)/mkinstalldirs $(infodir)
for file in $(INFO_DEPS); do \
-## This ${...} is in the shell, not in make. We use these strange
-## circumlocutions because we want the "ifile" to be relative, for the
-## install.
- for ifile in `cd $(srcdir) && echo $${file}*`; do \
+## We use these strange circumlocutions because we want the "ifile" to
+## be relative, for the install.
+ for ifile in `cd $(srcdir) && echo $$file*`; do \
$(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
done; \
## We need the 'else' because in some broken versions of sh 'if' will
git://sourceware.org / automake.git / commitdiff