CVS commit by luis: 

Add refactoring to the build system


  M +3 -3      Makefile.am   1.19