| Hi all,
I took a brief look at what's in the source tree and what's in the
Automake and SConstruct files. These are the initial things I've
found. I'm assuming that what is in the SConstruct file is more up to
date than what is in the Makefile.am, so have listed findings with that
assumption. I'm sure I've probably missed things, but either way, I
think we should get the multiple copies of source files out of the CVS
as soon as possible.
I've put the findings below. Please comment in detail what should be
removed and what shouldn't. After removing files I can try to spend
time syncing up the Makefile.am with the SConstruct file if needed.
Thanks,
steven
In SConstruct but not Makefile.am:
InOut/libsnd_u.c
In Makefile.am but not SConstruct:
InOut/ieee80.c
InOut/rtpa.c
InOut/soundin.c
InOut/soundio.c
InOut/ulaw.c
InOut/win98.c
Duplicates in the Makefile.am:
(From looking at the SConstruct file it seems these are the ones to remove)
Opcodes/ugens6.c (in OOps)
Opcodes/ugens7.c (in OOps)
Opcodes/ugens9.c (in OOps)
Top/csound_main.c (in frontends/csound/)
util2/mixer/extract.c (in Engine)
Top/pvl_main.c (in util2/pvlook.dir)
util2/pvlook.dir/pvl_main.c (in Top)
Other Notes:
Top/cscore.c and util1/cscore/cscore.c look to be replaced with
util1/cscore_main.c and Top/cscore_internal.c in SConstruct. The first
two should probably be removed.
sdif.c and sdif-mem.c exist in both Opcodes and SDIF directories, but
are referenced in both in the SConstruct. Not sure what is the way to
go on these. |