On Tue, Nov 29, 2005 at 09:37:48PM +0100, Adib Taraben wrote:

aaron@...749... schrieb:

...

Can src/make.dep, src/make.files and src/make.ofiles come out of the repository? Or is it possible to script their regeneration so that they stay in sync?

Aaron Spike

Yes those files are anoying because I always get conflict during CVS update.

Just removing the date from those files should reduce the frequency of conflicts.

I prefer to kick them out of the cvs but include into the inkscape.tar.gz archive. Is that possible?

My understanding is that those files are in CVS for people who don't have perl, so that people can still contribute to inkscape development even if they don't have perl -- so long as they don't mind the files taking a while to come up-to-date.

One issue with the current mkfiles.pl is that it looks for all *.cpp files whether or not they're in CVS, and then make will try to link those into libinkscape.a (when using Makefile.mingw). I don't know how serious this is. If anyone's interested, I've started work on a version that looks in Makefile.am (and the Makefile_insert files it includes). It already works relatively well, with the following limitations:

- It doesn't yet do variable substitutions, so the list of "sources" includes things like $(extension_internal_gnome_print_sources).

We're already parsing the _SOURCES variable settings, so I suppose it wouldn't be too hard to do variable substitutions.

- It reads all _SOURCES variables rather than just the ones for libraries linked into inkscape. This one should be easy to address, e.g. by matching _a_SOURCES instead of just _SOURCES, or by adding to make.exclude.

In some places, it does better than the existing mkfiles.pl, by excluding unused .cpp files.

pjrm.