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]

Looking at the end of PR10996 [4/4] (stmp-docobjdir Makefile.in changes)


This particular hunk isn't that important, but it seems like nice cleanup.

It simply moves the stmp-docobjdir dependency from the individual *.info
and *.[17] files to doc, info, and generated-manpages.

Please note that this patch was diffed to apply before [part 1].  But
they really are independent patches.

Bootstrapped i686-pc-cygwin (all languages, except ada)

Also tested by deleting the doc/ directory (and stmp-docobjdir) each
time before a make generated-manpages, make doc, and make info.  These
all worked as expected.

OK to install?

Kelley Cook

Note that, after these four changes, make dvi is the only other way
besides --enable-maintainer-mode or --enable-generated-files-in-srcdir
that files will be created in the source directory from the gcc
directory (which unfortunately does not include fastjar).  I'll get the
DVI part done after these hunks are approved/disapproved.





2003-10-21  Kelley Cook  <kcook@gcc.gnu.org>

	* Makefile.in (doc): Depend on stmp-docobjdir.
	(info): Likewise.
	(generated_manpages): Likewise.
	($(docobjdir)/%.info): No longer depend on stmp-docobjdir.
	($(docobjdir)/%.1): Likewise.
	($(docobjdir)/%.7): Likewise.

*** Makefile.in.orig	Wed Jan  1 12:00:00 2003
--- Makefile.in.2	Tue Oct 21 16:33:43 2003
*************** stmp-docobjdir:
*** 2613,2620 ****
  	-test -d $(docobjdir) || mkdir $(docobjdir)
  	$(STAMP) stmp-docobjdir
  
! doc: $(BUILD_INFO) $(GENERATED_MANPAGES) gccbug
! info:: $(docobjdir)/cpp.info $(docobjdir)/gcc.info $(docobjdir)/gccint.info $(docobjdir)/gccinstall.info $(docobjdir)/cppinternals.info
  
  TEXI_CPP_FILES = $(docdir)/cpp.texi $(docdir)/include/fdl.texi \
    $(docdir)/cppenv.texi $(docdir)/cppopts.texi
--- 2613,2622 ----
  	-test -d $(docobjdir) || mkdir $(docobjdir)
  	$(STAMP) stmp-docobjdir
  
! doc: stmp-docobjdir $(BUILD_INFO) $(GENERATED_MANPAGES) gccbug
! info:: stmp-docobjdir $(docobjdir)/cpp.info $(docobjdir)/gcc.info \
!   $(docobjdir)/gccint.info $(docobjdir)/gccinstall.info \
!   $(docobjdir)/cppinternals.info
  
  TEXI_CPP_FILES = $(docdir)/cpp.texi $(docdir)/include/fdl.texi \
    $(docdir)/cppenv.texi $(docdir)/cppopts.texi
*************** $(docobjdir)/gccint.info gccint.dvi: $(T
*** 2654,2660 ****
  $(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 $@ $<
  
--- 2656,2662 ----
  $(docobjdir)/gccinstall.info gccinstall.dvi: $(TEXI_GCCINSTALL_FILES)
  $(docobjdir)/cppinternals.info cppinternals.dvi: $(TEXI_CPPINT_FILES)
  
! $(docobjdir)/%.info: $(docdir)/%.texi
  	$(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) -I $(docdir)/include \
  	  -o $@ $<
  
*************** gccinstall.dvi:
*** 2667,2673 ****
  	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
  
--- 2669,2675 ----
  	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
  	$(TEXI2DVI) -I $$s/doc -I $$s/doc/include -o $@ $$s/doc/install.texi
  
! generated-manpages:: stmp-docobjdir $(docobjdir)/gcov.1 $(docobjdir)/cpp.1 \
  	$(docobjdir)/gcc.1 $(docobjdir)/gfdl.7 $(docobjdir)/gpl.7 \
  	$(docobjdir)/fsf-funding.7
  
*************** $(docobjdir)/gfdl.7: $(docdir)/include/f
*** 2680,2686 ****
  $(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 \
--- 2682,2688 ----
  $(docobjdir)/gpl.7: $(docdir)/include/gpl.texi
  $(docobjdir)/fsf-funding.7: $(docdir)/include/funding.texi
  
! $(docobjdir)/%.1: $(docdir)/%.texi
  	$(STAMP) $@
  	-$(TEXI2POD) $< > $(basename $(notdir $@)).pod
  	-($(POD2MAN) --section=1 \
*************** $(docobjdir)/%.1: $(docdir)/%.texi stmp-
*** 2689,2695 ****
  		(rm -f $(@).T$$$$ && exit 1)
  	-rm -f $(basename $(notdir $@)).pod
  
! $(docobjdir)/%.7: $(docdir)/%.texi stmp-docobjdir
  	$(STAMP) $@
  	-$(TEXI2POD) $< > $(basename $(notdir $@)).pod
  	-($(POD2MAN) --section=7 \
--- 2691,2697 ----
  		(rm -f $(@).T$$$$ && exit 1)
  	-rm -f $(basename $(notdir $@)).pod
  
! $(docobjdir)/%.7: $(docdir)/%.texi
  	$(STAMP) $@
  	-$(TEXI2POD) $< > $(basename $(notdir $@)).pod
  	-($(POD2MAN) --section=7 \




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