View Single Post
Old 12th January 2010
jggimi's Avatar
jggimi jggimi is offline
More noise than signal
 
Join Date: May 2008
Location: USA
Posts: 7,975
Default

Just to make things clear, here is an example of a small file, extracted from a -current repository with CVS: /usr/src/sys/Makefile:
Code:
#    $OpenBSD: Makefile,v 1.32 2009/09/09 12:10:35 marex Exp $
#    $NetBSD: Makefile,v 1.5 1995/09/15 21:05:21 pk Exp $

SUBDIR=    dev/microcode \
    arch/alpha arch/amd64 arch/armish arch/aviion arch/hp300 \
    arch/hppa arch/hppa64 arch/i386 arch/landisk arch/luna88k \
    arch/m68k arch/mac68k arch/macppc arch/mvme68k \
    arch/mvme88k arch/mvmeppc arch/palm arch/sgi arch/socppc \
    arch/solbourne arch/sparc arch/sparc64 arch/vax arch/zaurus

.include <bsd.subdir.mk>
Here is the CVS repository file, from my local repository, /cvs/src/sys/Makefile,v -- note the ",v" in the file name. This file contains the complete history of patches to this little Makefile. Note also that while the project uses unified diffs for patches, and we all think in unified diffs -- CVS stores patches in RCS format:
Code:
head    1.32;
access;
symbols
    OPENBSD_2_0:1.1.1.1.0.2
    OPENBSD_2_0_BASE:1.1.1.1
    OPENBSD_2_1:1.2.0.2
    OPENBSD_2_1_BASE:1.2
    OPENBSD_2_2:1.3.0.2
    OPENBSD_2_2_BASE:1.3
    OPENBSD_2_3:1.3.0.4
    OPENBSD_2_3_BASE:1.3
    OPENBSD_2_4:1.4.0.2
    OPENBSD_2_4_BASE:1.4
    OPENBSD_2_5:1.4.0.4
    OPENBSD_2_5_BASE:1.4
    OPENBSD_2_6:1.4.0.6
    OPENBSD_2_6_BASE:1.4
    OPENBSD_2_7:1.6.0.2
    OPENBSD_2_7_BASE:1.6
    OPENBSD_2_8:1.8.0.2
    OPENBSD_2_8_BASE:1.8
    OPENBSD_2_9:1.8.0.4
    OPENBSD_2_9_BASE:1.8
    OPENBSD_3_0:1.14.0.2
    OPENBSD_3_0_BASE:1.14
    OPENBSD_3_1:1.14.0.6
    OPENBSD_3_1_BASE:1.14
    OPENBSD_3_2:1.14.0.8
    OPENBSD_3_2_BASE:1.14
    OPENBSD_3_3:1.16.0.2
    OPENBSD_3_3_BASE:1.16
    OPENBSD_3_4:1.16.0.4
    OPENBSD_3_4_BASE:1.16
    OPENBSD_3_5:1.19.0.2
    OPENBSD_3_5_BASE:1.19
    OPENBSD_3_6:1.21.0.2
    OPENBSD_3_6_BASE:1.21
    OPENBSD_3_7:1.23.0.2
    OPENBSD_3_7_BASE:1.23
    OPENBSD_3_8:1.26.0.2
    OPENBSD_3_8_BASE:1.26
    OPENBSD_3_9:1.26.0.4
    OPENBSD_3_9_BASE:1.26
    OPENBSD_4_0:1.28.0.2
    OPENBSD_4_0_BASE:1.28
    OPENBSD_4_1:1.29.0.2
    OPENBSD_4_1_BASE:1.29
    OPENBSD_4_2:1.30.0.2
    OPENBSD_4_2_BASE:1.30
    OPENBSD_4_3:1.30.0.4
    OPENBSD_4_3_BASE:1.30
    OPENBSD_4_4:1.31.0.2
    OPENBSD_4_4_BASE:1.31
    OPENBSD_4_5:1.31.0.4
    OPENBSD_4_5_BASE:1.31
    OPENBSD_4_6:1.31.0.8
    OPENBSD_4_6_BASE:1.31
    SMP:1.5.0.2
    SMP_BASE:1.5
    SMP_SYNC_A:1.20
    SMP_SYNC_B:1.20
    UBC:1.14.0.4
    UBC_BASE:1.14
    UBC_SYNC_A:1.16
    UBC_SYNC_B:1.14
    kame_19991208:1.4
    netbsd_1_1:1.1.1.1;
locks; strict;
comment    @# @;


1.32
date    2009.09.09.12.10.35;    author marex;    state Exp;
branches;
next    1.31;

1.31
date    2008.05.15.20.19.11;    author kettenis;    state Exp;
branches;
next    1.30;

1.30
date    2007.08.01.21.23.28;    author miod;    state Exp;
branches;
next    1.29;

1.29
date    2006.10.06.22.18.16;    author deraadt;    state Exp;
branches;
next    1.28;

1.28
date    2006.05.29.17.22.48;    author drahn;    state Exp;
branches;
next    1.27;

1.27
date    2006.05.09.21.17.13;    author miod;    state Exp;
branches;
next    1.26;

1.26
date    2005.04.27.19.57.37;    author deraadt;    state Exp;
branches;
next    1.25;

1.25
date    2005.04.27.19.39.44;    author deraadt;    state Exp;
branches;
next    1.24;

1.24
date    2005.04.01.15.27.58;    author deraadt;    state Exp;
branches;
next    1.23;

1.23
date    2005.01.08.00.16.48;    author deraadt;    state Exp;
branches;
next    1.22;

1.22
date    2004.11.17.02.08.51;    author deraadt;    state Exp;
branches;
next    1.21;

1.21
date    2004.08.06.21.32.56;    author deraadt;    state Exp;
branches;
next    1.20;

1.20
date    2004.05.03.15.18.20;    author drahn;    state Exp;
branches;
next    1.19;

1.19
date    2004.02.07.20.23.05;    author deraadt;    state Exp;
branches;
next    1.18;

1.18
date    2004.01.29.08.15.29;    author deraadt;    state Exp;
branches;
next    1.17;

1.17
date    2003.10.31.04.06.02;    author drahn;    state Exp;
branches;
next    1.16;

1.16
date    2002.12.31.16.22.26;    author miod;    state Exp;
branches;
next    1.15;

1.15
date    2002.11.08.21.04.17;    author mickey;    state Exp;
branches;
next    1.14;

1.14
date    2001.09.07.15.36.53;    author jason;    state Exp;
branches;
next    1.13;

1.13
date    2001.09.01.16.02.42;    author drahn;    state Exp;
branches;
next    1.12;

1.12
date    2001.08.22.18.10.44;    author miod;    state Exp;
branches;
next    1.11;

1.11
date    2001.08.21.17.42.31;    author miod;    state Exp;
branches;
next    1.10;

1.10
date    2001.06.26.22.09.29;    author miod;    state Exp;
branches;
next    1.9;

1.9
date    2001.06.25.02.11.59;    author deraadt;    state Exp;
branches;
next    1.8;

1.8
date    2000.05.26.20.42.03;    author deraadt;    state Exp;
branches;
next    1.7;

1.7
date    2000.05.25.21.54.37;    author deraadt;    state Exp;
branches;
next    1.6;

1.6
date    2000.04.28.23.17.04;    author espie;    state Exp;
branches;
next    1.5;

1.5
date    2000.02.12.15.31.08;    author espie;    state Exp;
branches
    1.5.2.1;
next    1.4;

1.4
date    98.05.18.14.28.15;    author mickey;    state Exp;
branches;
next    1.3;

1.3
date    97.10.20.00.33.52;    author deraadt;    state Exp;
branches;
next    1.2;

1.2
date    97.01.19.15.19.19;    author niklas;    state Exp;
branches;
next    1.1;

1.1
date    95.10.18.08.49.37;    author deraadt;    state Exp;
branches
    1.1.1.1;
next    ;

1.1.1.1
date    95.10.18.08.49.37;    author deraadt;    state Exp;
branches;
next    ;

1.5.2.1
date    2001.04.18.16.00.01;    author niklas;    state Exp;
branches;
next    1.5.2.2;

1.5.2.2
date    2001.07.04.10.14.15;    author niklas;    state Exp;
branches;
next    1.5.2.3;

1.5.2.3
date    2001.10.31.03.32.28;    author nate;    state Exp;
branches;
next    1.5.2.4;

1.5.2.4
date    2003.03.27.22.28.24;    author niklas;    state Exp;
branches;
next    1.5.2.5;

1.5.2.5
date    2004.02.19.11.01.19;    author niklas;    state Exp;
branches;
next    1.5.2.6;

1.5.2.6
date    2004.06.05.23.12.26;    author niklas;    state Exp;
branches;
next    ;



desc
@@


1.32
log
@Palm: Integration into the tree

OK deraadt@@
@
text
@#    $OpenBSD: Makefile,v 1.31 2008/05/15 20:19:11 kettenis Exp $
#    $NetBSD: Makefile,v 1.5 1995/09/15 21:05:21 pk Exp $

SUBDIR=    dev/microcode \
    arch/alpha arch/amd64 arch/armish arch/aviion arch/hp300 \
    arch/hppa arch/hppa64 arch/i386 arch/landisk arch/luna88k \
    arch/m68k arch/mac68k arch/macppc arch/mvme68k \
    arch/mvme88k arch/mvmeppc arch/palm arch/sgi arch/socppc \
    arch/solbourne arch/sparc arch/sparc64 arch/vax arch/zaurus

.include <bsd.subdir.mk>
@


1.31
log
@Add socppc.
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.30 2007/08/01 21:23:28 miod Exp $
d8 1
a8 1
    arch/mvme88k arch/mvmeppc arch/sgi arch/socppc \
@


1.30
log
@Retire OpenBSD/cats. Hardware is nice but prone to catch fire, and the firmware
is anything but useful. Nevertheless this was a very good platform to use as
an OpenBSD/*arm* starting point, but nowadays this platform is not necessary
anymore.

Somehow these CATS motherboard are just like AUI hubs, with the difference that,
when my AUI hub caught fire, 10base5 support was not removed from the networking
code.
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.29 2006/10/06 22:18:16 deraadt Exp $
d8 2
a9 2
    arch/mvme88k arch/mvmeppc arch/sgi arch/solbourne \
    arch/sparc arch/sparc64 arch/vax arch/zaurus
@


1.29
log
@safe to enter landisk
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.28 2006/05/29 17:22:48 drahn Exp $
d5 1
a5 1
    arch/alpha arch/amd64 arch/armish arch/aviion arch/cats arch/hp300 \
@


1.28
log
@Link armish in to the builds.
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.27 2006/05/09 21:17:13 miod Exp $
d6 1
a6 1
    arch/hppa arch/hppa64 arch/i386 arch/luna88k \
@


1.27
log
@Administrative changes for aviion, ok deraadt@@
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.26 2005/04/27 19:57:37 deraadt Exp $
d5 1
a5 1
    arch/alpha arch/amd64 arch/aviion arch/cats arch/hp300 \
@


1.26
log
@sort
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.25 2005/04/27 19:39:44 deraadt Exp $
d5 1
a5 1
    arch/alpha arch/amd64 arch/cats arch/hp300 \
@


1.25
log
@solbourne Makefile and dive there
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.24 2005/04/01 15:27:58 deraadt Exp $
d5 5
a9 4
    arch/alpha arch/hp300 arch/hppa arch/hppa64 arch/i386 arch/m68k \
    arch/mac68k arch/macppc arch/mvme68k arch/mvme88k \
    arch/mvmeppc arch/sgi arch/solbourne arch/sparc arch/sparc64 \
    arch/vax arch/cats arch/amd64 arch/zaurus
@


1.24
log
@enter arch/hppa
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.23 2005/01/08 00:16:48 deraadt Exp $
d7 2
a8 2
    arch/mvmeppc arch/sgi arch/sparc arch/sparc64 arch/vax \
    arch/cats arch/amd64 arch/zaurus
@


1.23
log
@enter arch/zaurus
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.22 2004/11/17 02:08:51 deraadt Exp $
d5 1
a5 1
    arch/alpha arch/hp300 arch/hppa arch/i386 arch/m68k \
@


1.22
log
@enter dev/microcode dir
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.21 2004/08/06 21:32:56 deraadt Exp $
d8 1
a8 1
    arch/cats arch/amd64
@


1.21
log
@Makefile changes to enter deep down there
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.20 2004/05/03 15:18:20 drahn Exp $
d4 2
a5 1
SUBDIR=    arch/alpha arch/hp300 arch/hppa arch/i386 arch/m68k \
@


1.20
log
@Remove OpenBSD/pegaos, this has been announced before but delayed until
the tree was stable. No point in code supporting a company which screws
its employees being in the OpenBSD tree.
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.18 2004/01/29 08:15:29 deraadt Exp $
d6 2
a7 1
    arch/mvmeppc arch/sparc arch/sparc64 arch/vax arch/cats arch/amd64
@


1.19
log
@permit entry into arch/cats and arch/amd64
@
text
@d6 1
a6 2
    arch/mvmeppc arch/pegasos arch/sparc arch/sparc64 \
    arch/vax arch/cats arch/amd64
@


1.18
log
@mark directories to enter later
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.17 2003/10/31 04:06:02 drahn Exp $
d7 1
a7 2
    arch/vax
# arch/cats arch/amd64
@


1.17
log
@Add pegasos.
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.16.6.1 2003/10/10 17:04:14 drahn Exp $
d6 3
a8 1
    arch/mvmeppc arch/pegasos arch/sparc arch/sparc64 arch/vax
@


1.16
log
@Prepare for the removal of amiga and sun3 platforms from the tree.
There has not been enough activity and interest towards these platform
to keep them lying in the tree.
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.15 2002/11/08 21:04:17 mickey Exp $
d6 1
a6 1
    arch/mvmeppc arch/sparc arch/sparc64 arch/vax
@


1.15
log
@gotta get down into hppa too
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.14 2001/09/07 15:36:53 jason Exp $
d4 1
a4 1
SUBDIR=    arch/alpha arch/amiga arch/hp300 arch/hppa arch/i386 arch/m68k \
d6 1
a6 1
    arch/mvmeppc arch/sparc arch/sparc64 arch/sun3 arch/vax
@


1.14
log
@recurse into sparc64, too
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.13 2001/09/01 16:02:42 drahn Exp $
d4 1
a4 1
SUBDIR=    arch/alpha arch/amiga arch/hp300 arch/i386 arch/m68k \
@


1.13
log
@powerpc -> macppc rename changes.
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.12 2001/08/22 18:10:44 miod Exp $
d6 1
a6 1
    arch/mvmeppc arch/sparc arch/sun3 arch/vax
@


1.12
log
@Recurse in arch/m68k for make obj magic.
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.11 2001/08/21 17:42:31 miod Exp $
d5 2
a6 2
    arch/mac68k arch/mvme68k arch/mvme88k arch/mvmeppc \
    arch/powerpc arch/sparc arch/sun3 arch/vax
@


1.11
log
@Recurse in mvmeppc
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.10 2001/06/26 22:09:29 miod Exp $
d4 1
a4 1
SUBDIR=    arch/alpha arch/amiga arch/hp300 arch/i386 \
@


1.10
log
@Recurse in mvme88k/
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.9 2001/06/25 02:11:59 deraadt Exp $
d5 2
a6 2
    arch/mac68k arch/mvme68k arch/mvme88k arch/powerpc \
    arch/sparc arch/sun3 arch/vax
@


1.9
log
@zap pmax
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.8 2000/05/26 20:42:03 deraadt Exp $
a3 1
# arch/arc arch/wgrisc
d5 2
a6 2
    arch/mac68k arch/mvme68k arch/powerpc \
    arch/sparc arch/vax arch/sun3
@


1.8
log
@can now traverse into sun3
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.7 2000/05/25 21:54:37 deraadt Exp $
d6 1
a6 1
    arch/mac68k arch/mvme68k arch/pmax arch/powerpc \
@


1.7
log
@cause traversal into arch & subdirectories for the purposes of manual page install...
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.6 2000/04/28 23:17:04 espie Exp $
d7 1
a7 1
    arch/sparc arch/vax
@


1.6
log
@Fix obj on amiga. I'm an idiot.
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.5 2000/02/12 15:31:08 espie Exp $
d4 4
a7 13
.if make(obj)
SUBDIR=  arch/alpha arch/amiga arch/arc arch/hp300 arch/i386 \
    arch/m68k arch/mac68k arch/mvme68k arch/pmax arch/powerpc \
    arch/sparc arch/wgrisc arch/vax
.else
SUBDIR+= arch/${MACHINE}

# For manpages
.if ${MACHINE} != "amiga"
SUBDIR+= arch/amiga
.endif

.endif
@


1.5
log
@Let non-amiga build amiga manpages.
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.4 1998/05/18 14:28:15 mickey Exp $
d5 1
a5 1
SUBDIR=  arch/alpha arch/arc arch/hp300 arch/i386 \
a9 1
.endif
d14 2
@


1.4
log
@ok, i steal this commit from niklas, just to make vax consistant w/ other archs (;
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.3 1997/10/20 00:33:52 deraadt Exp $
d5 1
a5 1
SUBDIR=  arch/alpha arch/amiga arch/arc arch/hp300 arch/i386 \
d10 5
@


1.3
log
@build all arch/ obj thingies
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.2 1997/01/19 15:19:19 niklas Exp $
d7 1
a7 1
    arch/sparc arch/wgrisc
@


1.2
log
@Add OpenBSD tag
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.5 1995/09/15 21:05:21 pk Exp $
d4 5
d10 1
@


1.1
log
@Initial revision
@
text
@d1 1
@


1.1.1.1
log
@initial import of NetBSD tree
@
text
@@


1.5.2.1
log
@Update the SMP branch to -current, this breaks the SMP branch though.
But it will be fixed soonish.  Note, nothing new has happened, this is just
a merge of the trunk into this branch.
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.8 2000/05/26 20:42:03 deraadt Exp $
d4 12
a15 4
# arch/arc arch/wgrisc
SUBDIR=    arch/alpha arch/amiga arch/hp300 arch/i386 \
    arch/mac68k arch/mvme68k arch/pmax arch/powerpc \
    arch/sparc arch/vax arch/sun3
@


1.5.2.2
log
@Merge in -current from two days ago in the SMP branch.
As usual with merges, they do not indicate progress, so do not hold
your breath for working SMP, and do not mail me and ask about the
state of it.  It has not changed.  There is work ongoing, but very, very
slowly.  The commit is done in parts as to not lock up the tree in too
big chunks at a time.
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.5.2.1 2001/04/18 16:00:01 niklas Exp $
d4 1
d6 2
a7 2
    arch/mac68k arch/mvme68k arch/mvme88k arch/powerpc \
    arch/sparc arch/sun3 arch/vax
@


1.5.2.3
log
@Sync the SMP branch to something just after 3.0
@
text
@d1 1
a1 1
#    $OpenBSD: Makefile,v 1.5.2.2 2001/07/04 10:14:15 niklas Exp $
d4 3
a6 3
SUBDIR=    arch/alpha arch/amiga arch/hp300 arch/i386 arch/m68k \
    arch/mac68k arch/macppc arch/mvme68k arch/mvme88k \
    arch/mvmeppc arch/sparc arch/sparc64 arch/sun3 arch/vax
@


1.5.2.4
log
@Sync the SMP branch with 3.3
@
text
@d1 1
a1 1
#    $OpenBSD$
d4 1
a4 1
SUBDIR=    arch/alpha arch/hp300 arch/hppa arch/i386 arch/m68k \
d6 1
a6 1
    arch/mvmeppc arch/sparc arch/sparc64 arch/vax
@


1.5.2.5
log
@Merge of current from two weeks agointo the SMP branch
@
text
@d6 1
a6 3
    arch/mvmeppc arch/pegasos arch/sparc arch/sparc64 \
    arch/vax
# arch/cats arch/amd64
@


1.5.2.6
log
@Merge with the trunk
@
text
@d6 3
a8 1
    arch/mvmeppc arch/sparc arch/sparc64 arch/vax arch/cats arch/amd64
@
Reply With Quote