* lib/autoscan/Makefile.am (EXTRA_DIST, nodist_autoscanlib_DATA): autoscan.pre is...

diff --git a/ChangeLog b/ChangeLog
index 55a1d6acddd0b9973b4d721f308640045510956f..48f567153e654ba864183af1f7158bf6d3ac394c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
        * Makefile.am (cvs_files): Add install-sh and mkinstalldirs.
        * config/config.guess, config/mkinstalldirs, config/texinfo.tex:
        Update from masters.
+       * lib/autoscan/Makefile.am (EXTRA_DIST, nodist_autoscanlib_DATA):
+       autoscan.pre is not to be installed, and autoscan.list is not to
+       be shipped.
 
 2002-10-25  Akim Demaille  <akim@epita.fr>
 

diff --git a/lib/autoscan/Makefile.am b/lib/autoscan/Makefile.am
index 6d3013ca3134e7984089658d85406d7a8c7d962b..2b4de47925d3a920d5d68524111678b9b8b2a6fd 100644 (file)
--- a/lib/autoscan/Makefile.am
+++ b/lib/autoscan/Makefile.am
@@ -19,7 +19,8 @@
 
 autoscanlibdir = $(pkgdatadir)/autoscan
 
-dist_autoscanlib_DATA = autoscan.pre autoscan.list
+EXTRA_DIST = autoscan.pre
+nodist_autoscanlib_DATA = autoscan.list
 
 
 ## ------------------------ ##
@@ -32,10 +33,10 @@ dist_autoscanlib_DATA = autoscan.pre autoscan.list
 ## is built (we need it in the command below).
 include ../freeze.mk
 
-$(srcdir)/autoscan.list: $(srcdir)/autoscan.pre $(autoconf_m4f_dependencies) Makefile.am
-       echo '# Automatically Generated: do not edit this file' >$(srcdir)/autoscan.list
-       sed '/^[#]/!q' $(srcdir)/autoscan.pre >>$(srcdir)/autoscan.list
+autoscan.list: $(srcdir)/autoscan.pre $(autoconf_m4f_dependencies) Makefile.am
+       echo '# Automatically Generated: do not edit this file' >autoscan.list
+       sed '/^[#]/!q' $(srcdir)/autoscan.pre                  >>autoscan.list
        ( \
          sed -n '/^[^#]/p' $(srcdir)/autoscan.pre; \
          $(MY_AUTOM4TE) -M -l autoconf -t'AN_OUTPUT:$$1: $$2           $$3' \
-       ) | LC_ALL=C sort >>$(srcdir)/autoscan.list
+       ) | LC_ALL=C sort                                      >>autoscan.list

diff --git a/lib/autoscan/Makefile.in b/lib/autoscan/Makefile.in
index 399c43a45632dae84085adcd0eb28efdfce6d265..f313063ec976947e2d3edec4eebf341092d43fda 100644 (file)
--- a/lib/autoscan/Makefile.in
+++ b/lib/autoscan/Makefile.in
@@ -94,7 +94,8 @@ target_alias = @target_alias@
 
 autoscanlibdir = $(pkgdatadir)/autoscan
 
-dist_autoscanlib_DATA = autoscan.pre autoscan.list
+EXTRA_DIST = autoscan.pre
+nodist_autoscanlib_DATA = autoscan.list
 
 SUFFIXES = .m4 .m4f
 
@@ -171,10 +172,9 @@ subdir = lib/autoscan
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
-DATA = $(dist_autoscanlib_DATA)
+DATA = $(nodist_autoscanlib_DATA)
 
-DIST_COMMON = $(dist_autoscanlib_DATA) $(srcdir)/../freeze.mk \
-       Makefile.am Makefile.in
+DIST_COMMON = $(srcdir)/../freeze.mk Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
@@ -185,20 +185,20 @@ $(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../freeze.mk $(top_srcdir)/configu
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
 uninstall-info-am:
-dist_autoscanlibDATA_INSTALL = $(INSTALL_DATA)
-install-dist_autoscanlibDATA: $(dist_autoscanlib_DATA)
+nodist_autoscanlibDATA_INSTALL = $(INSTALL_DATA)
+install-nodist_autoscanlibDATA: $(nodist_autoscanlib_DATA)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(autoscanlibdir)
-       @list='$(dist_autoscanlib_DATA)'; for p in $$list; do \
+       @list='$(nodist_autoscanlib_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " $(dist_autoscanlibDATA_INSTALL) $$d$$p $(DESTDIR)$(autoscanlibdir)/$$f"; \
-         $(dist_autoscanlibDATA_INSTALL) $$d$$p $(DESTDIR)$(autoscanlibdir)/$$f; \
+         echo " $(nodist_autoscanlibDATA_INSTALL) $$d$$p $(DESTDIR)$(autoscanlibdir)/$$f"; \
+         $(nodist_autoscanlibDATA_INSTALL) $$d$$p $(DESTDIR)$(autoscanlibdir)/$$f; \
        done
 
-uninstall-dist_autoscanlibDATA:
+uninstall-nodist_autoscanlibDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(dist_autoscanlib_DATA)'; for p in $$list; do \
+       @list='$(nodist_autoscanlib_DATA)'; for p in $$list; do \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
          echo " rm -f $(DESTDIR)$(autoscanlibdir)/$$f"; \
          rm -f $(DESTDIR)$(autoscanlibdir)/$$f; \
@@ -289,7 +289,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_autoscanlibDATA
+install-data-am: install-nodist_autoscanlibDATA
 
 install-exec-am:
 
@@ -315,17 +315,17 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_autoscanlibDATA uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-nodist_autoscanlibDATA
 
 .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-dist_autoscanlibDATA install-exec install-exec-am \
-       install-info install-info-am install-man install-strip \
-       installcheck installcheck-am installdirs maintainer-clean \
+       install-am install-data install-data-am install-exec \
+       install-exec-am install-info install-info-am install-man \
+       install-nodist_autoscanlibDATA install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-       pdf-am ps ps-am uninstall uninstall-am \
-       uninstall-dist_autoscanlibDATA uninstall-info-am
+       pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
+       uninstall-nodist_autoscanlibDATA
 
 $(MY_AUTOM4TE):
        cd $(top_builddir)/tests && $(MAKE) $(AM_MAKEFLAGS) autom4te
@@ -360,13 +360,13 @@ check-forbidden-patterns:
          rm -f forbidden.log; \
        fi
 
-$(srcdir)/autoscan.list: $(srcdir)/autoscan.pre $(autoconf_m4f_dependencies) Makefile.am
-       echo '# Automatically Generated: do not edit this file' >$(srcdir)/autoscan.list
-       sed '/^[#]/!q' $(srcdir)/autoscan.pre >>$(srcdir)/autoscan.list
+autoscan.list: $(srcdir)/autoscan.pre $(autoconf_m4f_dependencies) Makefile.am
+       echo '# Automatically Generated: do not edit this file' >autoscan.list
+       sed '/^[#]/!q' $(srcdir)/autoscan.pre                  >>autoscan.list
        ( \
          sed -n '/^[^#]/p' $(srcdir)/autoscan.pre; \
          $(MY_AUTOM4TE) -M -l autoconf -t'AN_OUTPUT:$$1: $$2           $$3' \
-       ) | LC_ALL=C sort >>$(srcdir)/autoscan.list
+       ) | LC_ALL=C sort                                      >>autoscan.list
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: