Updated f() decls; New rules in makefile
fixed make for trap example