with the other methodology even if there are no choice buffers and no special constants. But it keeps the Makefile.am simple and the methodology consistent. This commit was SVN r10462.
