Revert "Revert to "corrected main" to keep things simple"

This reverts commit eda1ef17635425718fd59d65869ef4720198c18e.
Revert "corrected makefile"

This reverts commit d9c96b59759d2476043cdc338114578c1d5be5b2.
Revert "corrected makefile"

This reverts commit 60b0e45a3fbf7ae8d09ce8763b33e11f0770d5a6.
Revert "changed makefile.include to use VPATH, SRCLOC of user's app"

This reverts commit 004bb0bb941d0af28ed4dc1cfc2e03b55bb70e59.