Removed Mac OS X dependencies in CFLAGS and LDFLAGS.  Cleaned up targets a bit by removing old ones.