This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

PATCH: Clean up doc-building

From: Mark Mitchell <mark at codesourcery dot com>
To: gcc-patches at gcc dot gnu dot org
Cc: neroden at twcny dot rr dot com
Date: 29 Aug 2003 10:51:04 -0700
Subject: PATCH: Clean up doc-building

Nathanael --

What do you think of this patch?  

It chops about 45 lines out of the Makefile.

(I've tested it on i686-pc-linux-gnu.)

Thanks,

-- 
Mark Mitchell
CodeSourcery, LLC
mark@codesourcery.com

Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.1142
diff -c -5 -p -r1.1142 Makefile.in
*** Makefile.in	26 Aug 2003 18:47:25 -0000	1.1142
--- Makefile.in	29 Aug 2003 17:46:26 -0000
*************** TEXI_GCCINT_FILES = $(docdir)/gccint.tex
*** 2677,2779 ****
  TEXI_GCCINSTALL_FILES = $(docdir)/install.texi $(docdir)/install-old.texi \
  	 $(docdir)/include/fdl.texi
  
  TEXI_CPPINT_FILES = $(docdir)/cppinternals.texi
  
! $(docobjdir)/cpp.info: $(TEXI_CPP_FILES) stmp-docobjdir
! 	$(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) -I $(docdir)/include \
! 	  -o $@ $(docdir)/cpp.texi
! 
! $(docobjdir)/gcc.info: $(TEXI_GCC_FILES) stmp-docobjdir
! 	$(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) -I $(docdir)/include \
! 	  -o $@ $(docdir)/gcc.texi
! 
! $(docobjdir)/gccint.info: $(TEXI_GCCINT_FILES) stmp-docobjdir
! 	$(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) -I $(docdir)/include \
! 	  -o $@ $(docdir)/gccint.texi
! 
! $(docobjdir)/gccinstall.info: $(TEXI_GCCINSTALL_FILES) stmp-docobjdir
! 	$(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) -I $(docdir)/include \
! 	  -o $@ $(docdir)/install.texi
  
! $(docobjdir)/cppinternals.info: $(TEXI_CPPINT_FILES) stmp-docobjdir
  	$(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) -I $(docdir)/include \
! 	  -o $@ $(docdir)/cppinternals.texi
  
  dvi: gcc.dvi gccint.dvi gccinstall.dvi cpp.dvi lang.dvi cppinternals.dvi
  
! # This works with GNU Make's default rule.
! cpp.dvi: $(TEXI_CPP_FILES)
! 	$(TEXI2DVI) -I $(docdir) -I $(docdir)/include $(docdir)/cpp.texi
! 
! gcc.dvi: $(TEXI_GCC_FILES)
! 	$(TEXI2DVI) -I $(docdir) -I $(docdir)/include $(docdir)/gcc.texi
! 
! gccint.dvi: $(TEXI_GCCINT_FILES)
! 	$(TEXI2DVI) -I $(docdir) -I $(docdir)/include $(docdir)/gccint.texi
  
! gccinstall.dvi: $(TEXI_GCCINSTALL_FILES)
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(TEXI2DVI) -I $$s/doc -I $$s/doc/include -o $@ $$s/doc/install.texi
  
- cppinternals.dvi: $(TEXI_CPPINT_FILES)
- 	$(TEXI2DVI) -I $(docdir) -I $(docdir)/include $(docdir)/cppinternals.texi
- 
  generated-manpages: $(docobjdir)/gcov.1 $(docobjdir)/cpp.1 $(docobjdir)/gcc.1 \
! 	 $(docobjdir)/gfdl.7 $(docobjdir)/gpl.7 $(docobjdir)/fsf-funding.7 \
! 	 lang.generated-manpages
! 
! $(docobjdir)/gcov.1: $(docdir)/gcov.texi stmp-docobjdir
! 	$(STAMP) $(docobjdir)/gcov.1
! 	-$(TEXI2POD) $(docdir)/gcov.texi > gcov.pod
! 	-($(POD2MAN) --section=1 gcov.pod > $(docobjdir)/gcov.1.T$$$$ && \
! 		mv -f $(docobjdir)/gcov.1.T$$$$ $(docobjdir)/gcov.1) || \
! 		(rm -f $(docobjdir)/gcov.1.T$$$$ && exit 1)
! 	-rm -f gcov.pod
  
  $(docobjdir)/cpp.1: $(docdir)/cpp.texi $(docdir)/cppenv.texi \
!   $(docdir)/cppopts.texi stmp-docobjdir
! 	$(STAMP) $(docobjdir)/cpp.1
! 	-$(TEXI2POD) $(docdir)/cpp.texi > cpp.pod
! 	-($(POD2MAN) --section=1 cpp.pod > $(docobjdir)/cpp.1.T$$$$ && \
! 		mv -f $(docobjdir)/cpp.1.T$$$$ $(docobjdir)/cpp.1) || \
! 		(rm -f $(docobjdir)/cpp.1.T$$$$ && exit 1)
! 	-rm -f cpp.pod
! 
  $(docobjdir)/gcc.1: $(docdir)/invoke.texi $(docdir)/cppenv.texi \
!   $(docdir)/cppopts.texi stmp-docobjdir
! 	$(STAMP) $(docobjdir)/gcc.1
! 	-$(TEXI2POD) $(docdir)/invoke.texi > gcc.pod
! 	-($(POD2MAN) --section=1 gcc.pod > $(docobjdir)/gcc.1.T$$$$ && \
! 		mv -f $(docobjdir)/gcc.1.T$$$$ $(docobjdir)/gcc.1) || \
! 		(rm -f $(docobjdir)/gcc.1.T$$$$ && exit 1)
! 	-rm -f gcc.pod
! 
! $(docobjdir)/gfdl.7: $(docdir)/include/fdl.texi stmp-docobjdir
! 	$(STAMP) $(docobjdir)/gfdl.7
! 	-$(TEXI2POD) $(docdir)/include/fdl.texi > gfdl.pod
! 	-($(POD2MAN) --section=7 gfdl.pod > $(docobjdir)/gfdl.7.T$$$$ && \
! 		mv -f $(docobjdir)/gfdl.7.T$$$$ $(docobjdir)/gfdl.7) || \
! 		(rm -f $(docobjdir)/gfdl.7.T$$$$ && exit 1)
! 	-rm -f gfdl.pod
! 
! $(docobjdir)/gpl.7: $(docdir)/include/gpl.texi stmp-docobjdir
! 	$(STAMP) $(docobjdir)/gpl.7
! 	-$(TEXI2POD) $(docdir)/include/gpl.texi > gpl.pod
! 	-($(POD2MAN) --section=7 gpl.pod > $(docobjdir)/gpl.7.T$$$$ && \
! 		mv -f $(docobjdir)/gpl.7.T$$$$ $(docobjdir)/gpl.7) || \
! 		(rm -f $(docobjdir)/gpl.7.T$$$$ && exit 1)
! 	-rm -f gpl.pod
! 
! $(docobjdir)/fsf-funding.7: $(docdir)/include/funding.texi stmp-docobjdir
! 	$(STAMP) $(docobjdir)/fsf-funding.7
! 	-$(TEXI2POD) $(docdir)/include/funding.texi > fsf-funding.pod
! 	-($(POD2MAN) --section=7 fsf-funding.pod \
! 		> $(docobjdir)/fsf-funding.7.T$$$$ && \
! 	    mv -f $(docobjdir)/fsf-funding.7.T$$$$ $(docobjdir)/fsf-funding.7) || \
! 	    (rm -f $(docobjdir)/fsf-funding.7.T$$$$ && exit 1)
! 	-rm -f fsf-funding.pod
  
  #
  # Deletion of files made during compilation.
  # There are four levels of this:
  #   `mostlyclean', `clean', `distclean' and `maintainer-clean'.
--- 2677,2735 ----
  TEXI_GCCINSTALL_FILES = $(docdir)/install.texi $(docdir)/install-old.texi \
  	 $(docdir)/include/fdl.texi
  
  TEXI_CPPINT_FILES = $(docdir)/cppinternals.texi
  
! $(docobjdir)/cpp.info cpp.dvi: $(TEXI_CPP_FILES)
! $(docobjdir)/gcc.info gcc.dvi: $(TEXI_GCC_FILES)
! $(docobjdir)/gccint.info gccint.dvi: $(TEXI_GCCINT_FILES)
! $(docobjdir)/gccinstall.info gccinstall.dvi: $(TEXI_GCCINSTALL_FILES)
! $(docobjdir)/cppinternals.info cppinternals.dvi: $(TEXI_CPPINT_FILES)
  
! $(docobjdir)/%.info: $(docdir)/%.texi stmp-docobjdir
  	$(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) -I $(docdir)/include \
! 	  -o $@ $<
  
  dvi: gcc.dvi gccint.dvi gccinstall.dvi cpp.dvi lang.dvi cppinternals.dvi
  
! %.dvi: $(docdir)/%.texi
! 	$(TEXI2DVI) -I $(docdir) -I $(docdir)/include $(docdir)/$<
  
! gccinstall.dvi:
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(TEXI2DVI) -I $$s/doc -I $$s/doc/include -o $@ $$s/doc/install.texi
  
  generated-manpages: $(docobjdir)/gcov.1 $(docobjdir)/cpp.1 $(docobjdir)/gcc.1 \
! 	$(docobjdir)/gfdl.7 $(docobjdir)/gpl.7 $(docobjdir)/fsf-funding.7 \
! 	lang.generated-manpages
  
+ $(docobjdir)/gcov.1: $(docdir)/gcov.texi
  $(docobjdir)/cpp.1: $(docdir)/cpp.texi $(docdir)/cppenv.texi \
!   $(docdir)/cppopts.texi
  $(docobjdir)/gcc.1: $(docdir)/invoke.texi $(docdir)/cppenv.texi \
!   $(docdir)/cppopts.texi
! $(docobjdir)/gfdl.7: $(docdir)/include/fdl.texi
! $(docobjdir)/gpl.7: $(docdir)/include/gpl.texi
! $(docobjdir)/fsf-funding.7: $(docdir)/include/funding.texi
! 
! $(docobjdir)/%.1: $(docdir)/%.texi stmp-docobjdir
! 	$(STAMP) $@
! 	-$(TEXI2POD) $< > $(basename $(notdir $@)).pod
! 	-($(POD2MAN) --section=1 \
! 			$(basename $(notdir $@)).pod > $(@).T$$$$ && \
! 		mv -f $(@).T$$$$ $@) || \
! 		(rm -f $(@).T$$$$ && exit 1)
! 	-rm -f $(basename $(notdir $@)).pod
! 
! $(docobjdir)/%.7: $(docdir)/%.texi stmp-docobjdir
! 	$(STAMP) $@
! 	-$(TEXI2POD) $< > $(basename $(notdir $@)).pod
! 	-($(POD2MAN) --section=7 \
! 			$(basename $(notdir $@)).pod > $(@).T$$$$ && \
! 		mv -f $(@).T$$$$ $@) || \
! 		(rm -f $(@).T$$$$ && exit 1)
! 	-rm -f $(basename $(notdir $@)).pod
  
  #
  # Deletion of files made during compilation.
  # There are four levels of this:
  #   `mostlyclean', `clean', `distclean' and `maintainer-clean'.

Follow-Ups:
- Re: PATCH: Clean up doc-building
  - From: DJ Delorie
- Re: PATCH: Clean up doc-building
  - From: Alexandre Oliva

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]