Revise .c.o rules in Makefiles
Merge branch 'fix/make' into develop
Merge branch 'develop'