Makefile changes to protect original compiler flags

Merged Eclipse Webmaster requested to merge github/fork/gpilisi/master into master

Created by: gpilisi

Merge request reports