[PD-cvs] abstractions Makefile,1.5,1.6 Makefile.dirs,1.2,1.3