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]

More libf2c DOS-naming necessary?


Now that I've had time to look at the 19980715 snapshot, I see more
places where the DOS-o-phobic names `g2c.h.in' and `config.h.in'
appeared in the CVS sources you (Jeff) were working on when you
asked me to submit a patch to take care of renaming them.  But, at
that point, I was using a version of the 19980707 snapshot, which
I'd neglected to updated with Dave Love's libf2c patches to stay
reasonably up-to-date.

So, in case you took me at my "word" (i.e. just applied the patch
I emailed you earlier, without looking for more occurrances of
the offending filenames), here's another patch that should straighten
things out.  (Dave, could you review it to make sure it's sane from
your point of view?)

Jeff, could you apply this to both trunks (main and 1.1), if that
hasn't already been done?

Note that, aside from the simply renaming, I changed the invocation
of autoheader to ensure that it writes `config.hin' instead of
`config.h.in'.  The documentation for autoheader (autoconf) gave
me more confidence that `autoheader foo' writes to standard output
(and reads foo instead of configure.in, whereas `autoheader' by
itself reads configure.in and writes config.h.in) than it did that
the `bar' in configure.in's `AC_CONFIG_HEADER(foo:bar)' would be
what autoheader writes its output to.  So I didn't bother testing
the latter; plus, I like it that the makefile is a bit more explicit
about what files it writes.

Also note that the ChangeLog entry is in the form of a diff, because
it includes a modest fixup a few lines after the new entry.

Also also note that I would think some of these changes might
result in changes to derived files in the repository.  That's
certainly the case for earlier patches I submitted to you
(e.g. the one changing gcc/f/bugs.texi, which triggers changes
in gcc/f/BUGS when the g77 docs are rebuilt).  FWIW.

        tq vm, (burley)


*** g77-e/libf2c/ChangeLog.~1~	Tue Jul 14 15:04:46 1998
--- g77-e/libf2c/ChangeLog	Thu Jul 16 18:52:19 1998
***************
*** 1,2 ****
--- 1,11 ----
+ Thu Jul 16 18:50:27 1998  Craig Burley  <burley@gnu.org>
+ 
+ 	* Makefile.in (g2c.h): Rename g2c.h.in to g2c.hin for DOS.
+ 
+ 	* libU77/Makefile.in: Rename config.h.in to config.hin for DOS.
+ 	Explicitly output autoheader stdout to config.hin, though
+ 	configure.in's AC_CONFIG_HEADER macro should take care of
+ 	this, so readers of Makefile.in know what they're seeing.
+ 
  Mon Jul 13 13:31:03 1998  Craig Burley  <burley@gnu.org>
  
*************** Mon Jul 13 13:31:03 1998  Craig Burley  
*** 16,20 ****
  	subdirs.  Tidy up handling of RANLIB etc.
  
! 	* stamp-h.in, libF77/configure.in, libI77/configure.in,
  	libF77/configure, libI77/configure: New files.
  
--- 25,29 ----
  	subdirs.  Tidy up handling of RANLIB etc.
  
! 	* libU77/stamp-h.in, libF77/configure.in, libI77/configure.in,
  	libF77/configure, libI77/configure: New files.
  
*** g77-e/libf2c/Makefile.in.~1~	Tue Jul 14 16:29:14 1998
--- g77-e/libf2c/Makefile.in	Thu Jul 16 18:31:33 1998
*************** ${srcdir}/configure: ${srcdir}/configure
*** 119,123 ****
  
  # Dependence on Makefile serializes for parallel make.
! g2c.h: $(srcdir)/g2c.h.in config.status Makefile
  # Might try to avoid rebuilding everything if Makefile or configure
  # changes and g2c.h doesn't; see also the Makefile rule.  Should
--- 119,123 ----
  
  # Dependence on Makefile serializes for parallel make.
! g2c.h: $(srcdir)/g2c.hin config.status Makefile
  # Might try to avoid rebuilding everything if Makefile or configure
  # changes and g2c.h doesn't; see also the Makefile rule.  Should
*** g77-e/libf2c/libU77/Makefile.in.~1~	Tue Jul 14 16:29:18 1998
--- g77-e/libf2c/libU77/Makefile.in	Thu Jul 16 18:48:12 1998
*************** ${srcdir}/configure: configure.in
*** 100,110 ****
  	cd ${srcdir} && autoconf
  
! ${srcdir}/config.h.in: stamp-h.in
  ${srcdir}/stamp-h.in: configure.in acconfig.h
! 	cd ${srcdir} && autoheader
  	echo timestamp > ${srcdir}/stamp-h.in
  
  config.h: stamp-h
! stamp-h: config.h.in config.status
  	$(SHELL) config.status
  	echo timestamp > stamp-h
--- 100,110 ----
  	cd ${srcdir} && autoconf
  
! ${srcdir}/config.hin: stamp-h.in
  ${srcdir}/stamp-h.in: configure.in acconfig.h
! 	cd ${srcdir} && autoheader configure.in > config.hin
  	echo timestamp > ${srcdir}/stamp-h.in
  
  config.h: stamp-h
! stamp-h: config.hin config.status
  	$(SHELL) config.status
  	echo timestamp > stamp-h


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