-AVR_ROOT := "/Applications/Arduino.app/Contents/Resources/Java/hardware/tools/avr/"
-AVR_INC := ${AVR_ROOT}/avr-4/
-AVR := ${AVR_ROOT}/bin/avr-
-LFLAGS += -L/opt/local/lib
+# gcc 4.2 from MacOS is really not up to scratch anymore
+CC = clang
+AVR_ROOT := "/Applications/Arduino.app/Contents/Resources/Java/hardware/tools/avr/"
+AVR_INC := ${AVR_ROOT}/avr-4/
+AVR := ${AVR_ROOT}/bin/avr-
+# Thats for MacPorts libelf
+ifeq (${shell test -d /opt/local && echo Exists}, Exists)
+IPATH += /opt/local/include
+LFLAGS = -L/opt/local/lib/
+endif
+else
+AVR_ROOT := /usr/lib/avr
+AVR_INC := ${AVR_ROOT}
+AVR := avr-
+CFLAGS += -fPIC
+endif
+
+CPPFLAGS += --std=gnu99 -Wall
+CPPFLAGS += ${patsubst %,-I%,${subst :, ,${IPATH}}}
+
+AVR_CPPFLAGS= ${CPPFLAGS} -idirafter ${AVR_INC}/include
+
+CC ?= clang
+AR ?= ar
+RANLIB ?= ranlib
+MKDIR ?= mkdir -p
+INSTALL ?= install
+SHELL := ${shell which bash}
+
+OBJ = obj-${shell $(CC) -dumpmachine}
+LIBDIR = ${shell pwd}/${SIMAVR}/${OBJ}
+LDFLAGS += -L${LIBDIR} -lsimavr
+
+LDFLAGS += -lelf
+
+ifeq (${shell uname}, Linux)
+ifeq ($(RELEASE),1)
+# allow the shared library to be found in the build directory
+# only for linking, the install time location is used at runtime
+LFLAGS += -Wl,-rpath-link,${LIBDIR}