CVS conflict avoidance

Ian Lance Taylor ian@cygnus.com
Wed Feb 4 21:58:00 GMT 1998


   Date: Wed, 4 Feb 1998 23:25:01 -0600
   From: Robert Lipe <robertl@dgii.com>

   We have several files in EGCS that are generated from other files in 
   EGCS.  These include pairs like configure.in and configure and *-parse.y
   and *-parse.c.

   [This causes problems with CVS]

One approach is the --enable-maintainer-mode configure option used by
automake.  We would arrange matters such that the dependencies of
these files were only present if --enable-maintainer-mode was used.
If that configuration option were not used, then configure would not
depend upon configure.in, and c-parse.y would not depend upon
c-parse.c.

In automake this is done by having --enable-maintainer-mode substitute
MAINT as the empty string, while its absence substitutes MAINT as
`#M#'.  Then rules are written as
    configure: @MAINT@configure.in
            autoconf
So if you do not configure with --enable-maintainer-mode, configure is
only rebuilt if it does not exist at all.

Ian



More information about the Gcc mailing list