timers: don't reconfigure for minor changes

[simavr] / simavr / Makefile

diff --git a/simavr/Makefile b/simavr/Makefile
index cb0c017..0d21100 100644 (file)
--- a/simavr/Makefile
+++ b/simavr/Makefile
@@ -18,51 +18,34 @@
 
 target = run_avr
 
-ifeq (${shell uname}, Darwin)
-AVR_ROOT := "/Applications/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-4/"
-else
-AVR_ROOT := /usr/lib/avr
-endif
-
-CFLAGS =  -g -std=gnu99 -Wall
-CFLAGS += -O3  -mfpmath=sse -msse2
+CFLAGS += -O3  -mfpmath=sse -msse2 -Wall
+#CFLAGS        += -DCONFIG_SIMAVR_TRACE=1
 
 cores  = ${wildcard cores/*.c}
 cores_o = ${patsubst cores/%.c, obj/%.o, ${cores}}
 sim            = ${wildcard sim/sim_*.c} ${wildcard sim/avr_*.c}
 sim_o  = ${patsubst sim/%.c, obj/%.o, ${sim}}
 
-VPATH  = .
-VPATH  += cores
+VPATH  = cores
 VPATH  += sim
 
-IPATH  = .
-IPATH  += sim
+IPATH  = sim
 IPATH  += ../../shared
 IPATH  += ../include
-IPATH  += /opt/local/include
 
-CFLAGS += ${patsubst %,-I%,${subst :, ,${IPATH}}}
+# Thats for MacPorts libelf
+IPATH  += /opt/local/include
 LFLAGS = -L/opt/local/lib/
-LDFLAGS        += -lelf 
 
 all:   obj libsimavr.a ${target}
 
-obj:
-       @mkdir -p obj
-
-obj/sim_%.o : cores/sim_%.h ${wildcard cores/*.h} ${wildcard sim/*.h}
 obj/sim_%.o : cores/sim_%.c
-       @gcc $(CFLAGS) \
-               -I${AVR_ROOT}/include/ \
+       @gcc $(CFLAGS) -MD \
+               -I${AVR_INC}/include/ \
                $<  -c -o $@
        @echo CORE $<
 
-obj/%.o: %.h sim/*.h
-obj/%.o: %.c
-       @gcc $(CFLAGS) \
-               $<  -c -o $@
-       @echo CC $<
+include ../Makefile.common
 
 libsimavr.a    :       ${cores_o}
 libsimavr.a    :       ${sim_o}
@@ -79,4 +62,3 @@ ${target}     :       obj/${target}.o
 
 clean:
        rm -rf ${target} obj *.a
-