Re: [Gnu-arch-users] libtla

[Tom Lord]

    > From: Brian May <address@hidden>

    >     Tom> I think these go in -utils:

    >     Tom>   chatter.[ch] editor.[ch] exec.[ch] hooks.[ch]

    >     Tom> and the rest in -cmds.

    > Ok, I moved the rest of these files. patch-3.

    > One problem remains:

    > [604] [scrooge:bam] ~/tree/arch/src/tla >grep .-cmds libarch-utils/*
    > libarch-utils/merge-points.h:#include "tla/libarch-cmds/archive.h"

    > Whats the best solution?

    > If I moved archive.h to -utils, then these would be broken:

    > [612] [scrooge:bam] ~/tree/arch/src/tla >grep .-cmds 
libarch-cmds/archive.[ch]
    > #include "tla/libarch-cmds/archives.h"
    > #include "tla/libarch-cmds/archive-version.h"
    > #include "tla/libarch-cmds/pfs.h"
    > #include "tla/libarch-cmds/archive-pfs.h"
    > #include "tla/libarch-cmds/archive.h"

    > If I moved merge-points.[ch] to -cmds, then patch-logs would break:

    > [617] [scrooge:bam] ~/tree/arch/src/tla >grep 'include.*merge-points' 
libarch-utils/*.[ch]
    > libarch-utils/merge-points.c:#include "tla/libarch-utils/merge-points.h"
    > libarch-utils/patch-logs.c:#include "tla/libarch-utils/merge-points.h"


Thanks.   

I'm not sure why you're grepping for archive.h in -cmds: -cmds is
allowed to include stuff from -utils.   But, -utils shouldn't include
stuff from -cmds so the second grep is the problem.

archive.[ch] definately goes in -cmds.   So the problem is
merege-points.c.

In fact, only one function in merge-points.c is a problem:
arch_archive_merge_points.  

So, could you please: 

  ~ change the two two static functions in merge-points.c 
    to extern (and add them to merge-points.h).

  ~ make a new file, archive-merge-points.c for the function
    arch_archive_merge_points.

  ~ merge-points.[ch] go in -utils; archive-merge-points.[ch]
    in -cmd.


-t