Revert "fix wrong build flags setup and add more build flags"

This reverts commit b1c31a047c01de23a7756d44585bdc3276af31dc.

Conflicts:
	Makefile