Cosmic-ray shock acceleration in the presence of self-excited waves