Change method used to disable ``maintainer-mode'' style rules to one

that is more "[cvs] diff" friendly.
Method suggested by Chris Demetriou on source-changes@ on July 25.
This commit is contained in:
lukem 2003-10-10 15:14:16 +00:00
parent 06332c88ef
commit 83590dd4eb
2 changed files with 103 additions and 77 deletions

View File

@ -2512,21 +2512,31 @@ TEXI_GCCINSTALL_FILES = $(docdir)/install.texi $(docdir)/install-old.texi \
TEXI_CPPINT_FILES = $(docdir)/cppinternals.texi
#$(docdir)/cpp.info: $(TEXI_CPP_FILES)
# cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/cpp.info doc/cpp.texi
#
#$(docdir)/gcc.info: $(TEXI_GCC_FILES)
# cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/gcc.info doc/gcc.texi
#
#$(docdir)/gccint.info: $(TEXI_GCCINT_FILES)
# cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/gccint.info doc/gccint.texi
#
#$(docdir)/gccinstall.info: $(TEXI_GCCINSTALL_FILES)
# cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/gccinstall.info doc/install.texi
#
#$(docdir)/cppinternals.info: $(TEXI_CPPINT_FILES)
# cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/cppinternals.info \
# doc/cppinternals.texi
$(docdir)/cpp.info: $(TEXI_CPP_FILES)
@echo "NOT REBUILDING $@"
NetBSD_DISABLED_cpp.info:
cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/cpp.info doc/cpp.texi
$(docdir)/gcc.info: $(TEXI_GCC_FILES)
@echo "NOT REBUILDING $@"
NetBSD_DISABLED_gcc.info:
cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/gcc.info doc/gcc.texi
$(docdir)/gccint.info: $(TEXI_GCCINT_FILES)
@echo "NOT REBUILDING $@"
NetBSD_DISABLED_gccint.info:
cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/gccint.info doc/gccint.texi
$(docdir)/gccinstall.info: $(TEXI_GCCINSTALL_FILES)
@echo "NOT REBUILDING $@"
NetBSD_DISABLED_gccinstall.info:
cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/gccinstall.info doc/install.texi
$(docdir)/cppinternals.info: $(TEXI_CPPINT_FILES)
@echo "NOT REBUILDING $@"
NetBSD_DISABLED_cppinternals.info:
cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -I doc/include -o doc/cppinternals.info \
doc/cppinternals.texi
dvi: gcc.dvi gccint.dvi gccinstall.dvi cpp.dvi lang.dvi cppinternals.dvi
@ -2551,56 +2561,68 @@ generated-manpages: $(docdir)/gcov.1 $(docdir)/cpp.1 $(docdir)/gcc.1 \
$(docdir)/gfdl.7 $(docdir)/gpl.7 $(docdir)/fsf-funding.7 \
lang.generated-manpages
#$(docdir)/gcov.1: $(docdir)/gcov.texi
# $(STAMP) $(docdir)/gcov.1
# -$(TEXI2POD) $(docdir)/gcov.texi > gcov.pod
# -($(POD2MAN) --section=1 gcov.pod > $(docdir)/gcov.1.T$$$$ && \
# mv -f $(docdir)/gcov.1.T$$$$ $(docdir)/gcov.1) || \
# (rm -f $(docdir)/gcov.1.T$$$$ && exit 1)
# -rm -f gcov.pod
$(docdir)/gcov.1: $(docdir)/gcov.texi
@echo "NOT REBUILDING $@"
NetBSD_DISABLED_gcov.1:
$(STAMP) $(docdir)/gcov.1
-$(TEXI2POD) $(docdir)/gcov.texi > gcov.pod
-($(POD2MAN) --section=1 gcov.pod > $(docdir)/gcov.1.T$$$$ && \
mv -f $(docdir)/gcov.1.T$$$$ $(docdir)/gcov.1) || \
(rm -f $(docdir)/gcov.1.T$$$$ && exit 1)
-rm -f gcov.pod
#$(docdir)/cpp.1: $(docdir)/cpp.texi $(docdir)/cppenv.texi \
# $(docdir)/cppopts.texi
# $(STAMP) $(docdir)/cpp.1
# -$(TEXI2POD) $(docdir)/cpp.texi > cpp.pod
# -($(POD2MAN) --section=1 cpp.pod > $(docdir)/cpp.1.T$$$$ && \
# mv -f $(docdir)/cpp.1.T$$$$ $(docdir)/cpp.1) || \
# (rm -f $(docdir)/cpp.1.T$$$$ && exit 1)
# -rm -f cpp.pod
$(docdir)/cpp.1: $(docdir)/cpp.texi $(docdir)/cppenv.texi \
$(docdir)/cppopts.texi
@echo "NOT REBUILDING $@"
NetBSD_DISABLED_cpp.1:
$(STAMP) $(docdir)/cpp.1
-$(TEXI2POD) $(docdir)/cpp.texi > cpp.pod
-($(POD2MAN) --section=1 cpp.pod > $(docdir)/cpp.1.T$$$$ && \
mv -f $(docdir)/cpp.1.T$$$$ $(docdir)/cpp.1) || \
(rm -f $(docdir)/cpp.1.T$$$$ && exit 1)
-rm -f cpp.pod
#$(docdir)/gcc.1: $(docdir)/invoke.texi $(docdir)/cppenv.texi \
# $(docdir)/cppopts.texi
# $(STAMP) $(docdir)/gcc.1
# -$(TEXI2POD) $(docdir)/invoke.texi > gcc.pod
# -($(POD2MAN) --section=1 gcc.pod > $(docdir)/gcc.1.T$$$$ && \
# mv -f $(docdir)/gcc.1.T$$$$ $(docdir)/gcc.1) || \
# (rm -f $(docdir)/gcc.1.T$$$$ && exit 1)
# -rm -f gcc.pod
$(docdir)/gcc.1: $(docdir)/invoke.texi $(docdir)/cppenv.texi \
$(docdir)/cppopts.texi
@echo "NOT REBUILDING $@"
NetBSD_DISABLED_gcc.1:
$(STAMP) $(docdir)/gcc.1
-$(TEXI2POD) $(docdir)/invoke.texi > gcc.pod
-($(POD2MAN) --section=1 gcc.pod > $(docdir)/gcc.1.T$$$$ && \
mv -f $(docdir)/gcc.1.T$$$$ $(docdir)/gcc.1) || \
(rm -f $(docdir)/gcc.1.T$$$$ && exit 1)
-rm -f gcc.pod
#$(docdir)/gfdl.7: $(docdir)/include/fdl.texi
# $(STAMP) $(docdir)/gfdl.7
# -$(TEXI2POD) $(docdir)/include/fdl.texi > gfdl.pod
# -($(POD2MAN) --section=7 gfdl.pod > $(docdir)/gfdl.7.T$$$$ && \
# mv -f $(docdir)/gfdl.7.T$$$$ $(docdir)/gfdl.7) || \
# (rm -f $(docdir)/gfdl.7.T$$$$ && exit 1)
# -rm -f gfdl.pod
$(docdir)/gfdl.7: $(docdir)/include/fdl.texi
@echo "NOT REBUILDING $@"
NetBSD_DISABLED_gfdl.7:
$(STAMP) $(docdir)/gfdl.7
-$(TEXI2POD) $(docdir)/include/fdl.texi > gfdl.pod
-($(POD2MAN) --section=7 gfdl.pod > $(docdir)/gfdl.7.T$$$$ && \
mv -f $(docdir)/gfdl.7.T$$$$ $(docdir)/gfdl.7) || \
(rm -f $(docdir)/gfdl.7.T$$$$ && exit 1)
-rm -f gfdl.pod
#$(docdir)/gpl.7: $(docdir)/include/gpl.texi
# $(STAMP) $(docdir)/gpl.7
# -$(TEXI2POD) $(docdir)/include/gpl.texi > gpl.pod
# -($(POD2MAN) --section=7 gpl.pod > $(docdir)/gpl.7.T$$$$ && \
# mv -f $(docdir)/gpl.7.T$$$$ $(docdir)/gpl.7) || \
# (rm -f $(docdir)/gpl.7.T$$$$ && exit 1)
# -rm -f gpl.pod
$(docdir)/gpl.7: $(docdir)/include/gpl.texi
@echo "NOT REBUILDING $@"
NetBSD_DISABLED_gpl.7:
$(STAMP) $(docdir)/gpl.7
-$(TEXI2POD) $(docdir)/include/gpl.texi > gpl.pod
-($(POD2MAN) --section=7 gpl.pod > $(docdir)/gpl.7.T$$$$ && \
mv -f $(docdir)/gpl.7.T$$$$ $(docdir)/gpl.7) || \
(rm -f $(docdir)/gpl.7.T$$$$ && exit 1)
-rm -f gpl.pod
#$(docdir)/fsf-funding.7: $(docdir)/include/funding.texi
# $(STAMP) $(docdir)/fsf-funding.7
# -$(TEXI2POD) $(docdir)/include/funding.texi > fsf-funding.pod
# -($(POD2MAN) --section=7 fsf-funding.pod \
# > $(docdir)/fsf-funding.7.T$$$$ && \
# mv -f $(docdir)/fsf-funding.7.T$$$$ $(docdir)/fsf-funding.7) || \
# (rm -f $(docdir)/fsf-funding.7.T$$$$ && exit 1)
# -rm -f fsf-funding.pod
$(docdir)/fsf-funding.7: $(docdir)/include/funding.texi
@echo "NOT REBUILDING $@"
NetBSD_DISABLED_fsf-funding.7:
$(STAMP) $(docdir)/fsf-funding.7
-$(TEXI2POD) $(docdir)/include/funding.texi > fsf-funding.pod
-($(POD2MAN) --section=7 fsf-funding.pod \
> $(docdir)/fsf-funding.7.T$$$$ && \
mv -f $(docdir)/fsf-funding.7.T$$$$ $(docdir)/fsf-funding.7) || \
(rm -f $(docdir)/fsf-funding.7.T$$$$ && exit 1)
-rm -f fsf-funding.pod
#
# Deletion of files made during compilation.

View File

@ -148,17 +148,19 @@ f77.dvi: f/g77.dvi
f77.generated-manpages: $(srcdir)/f/g77.1
# g77 documentation.
#$(srcdir)/f/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
# $(srcdir)/f/ffe.texi $(srcdir)/f/invoke.texi \
# $(srcdir)/f/news.texi $(srcdir)/f/intdoc.texi \
# $(srcdir)/f/root.texi $(srcdir)/doc/include/fdl.texi \
# $(srcdir)/doc/include/gpl.texi \
# $(srcdir)/doc/include/funding.texi \
# $(srcdir)/doc/include/gcc-common.texi
# if [ x$(BUILD_INFO) = xinfo ]; then \
# rm -f $(srcdir)/f/g77.info-*; \
# cd $(srcdir)/f && $(MAKEINFO) -I../doc/include -o g77.info g77.texi; \
# else true; fi
$(srcdir)/f/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
$(srcdir)/f/ffe.texi $(srcdir)/f/invoke.texi \
$(srcdir)/f/news.texi $(srcdir)/f/intdoc.texi \
$(srcdir)/f/root.texi $(srcdir)/doc/include/fdl.texi \
$(srcdir)/doc/include/gpl.texi \
$(srcdir)/doc/include/funding.texi \
$(srcdir)/doc/include/gcc-common.texi
@echo "NOT REBUILDING $@"
NetBSD_DISABLED_g77.info:
if [ x$(BUILD_INFO) = xinfo ]; then \
rm -f $(srcdir)/f/g77.info-*; \
cd $(srcdir)/f && $(MAKEINFO) -I../doc/include -o g77.info g77.texi; \
else true; fi
f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
$(srcdir)/f/ffe.texi $(srcdir)/f/invoke.texi \
@ -170,12 +172,14 @@ f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
cd f && $(TEXI2DVI) -I $$s/doc/include $$s/f/g77.texi
#$(srcdir)/f/g77.1: $(srcdir)/f/invoke.texi
# -$(TEXI2POD) < $(srcdir)/f/invoke.texi > f/g77.pod; \
# ($(POD2MAN) --section=1 f/g77.pod > f/g77.1.T$$$$ && \
# mv -f f/g77.1.T$$$$ $(srcdir)/f/g77.1) || \
# (rm -f f/g77.1.T$$$$ && exit 1); \
# rm -f f/g77.pod; \
$(srcdir)/f/g77.1: $(srcdir)/f/invoke.texi
@echo "NOT REBUILDING $@"
NetBSD_DISABLED_g77.1:
-$(TEXI2POD) < $(srcdir)/f/invoke.texi > f/g77.pod; \
($(POD2MAN) --section=1 f/g77.pod > f/g77.1.T$$$$ && \
mv -f f/g77.1.T$$$$ $(srcdir)/f/g77.1) || \
(rm -f f/g77.1.T$$$$ && exit 1); \
rm -f f/g77.pod; \
# This dance is all about producing accurate documentation for g77's
# intrinsics with minimum fuss. f/ansify appends "\n\" to C strings