diff -r 6a5cdca4de01 -r a9543d2ccd56 src/Makefile.in --- a/src/Makefile.in Tue May 23 01:15:22 2006 +0200 +++ b/src/Makefile.in Fri May 26 21:24:17 2006 +0200 @@ -35,17 +35,11 @@ NVRAM_ENABLE = SUB_NVRAM_ENABLE CAN_DRIVER = SUB_CAN_DRIVER TIMERS_DRIVER = SUB_TIMERS_DRIVER -TIMERS_ENABLE = SUB_TIMERS_ENABLE INCLUDES = -I../include -I../include/$(TARGET) -I../include/$(CAN_DRIVER) -I../include/$(TIMERS_DRIVER) -I../drivers/$(TARGET) OBJS = $(TARGET)_objacces.o $(TARGET)_lifegrd.o $(TARGET)_sdo.o\ - $(TARGET)_pdo.o $(TARGET)_sync.o $(TARGET)_nmtSlave.o $(TARGET)_nmtMaster.o $(TARGET)_states.o - -# ecos driver shortcuts timer.c -ifeq ($(TIMERS_ENABLE),YES) -OBJS += $(TARGET)_timer.o -endif + $(TARGET)_pdo.o $(TARGET)_sync.o $(TARGET)_nmtSlave.o $(TARGET)_nmtMaster.o $(TARGET)_states.o $(TARGET)_timer.o # # # # Target specific paramters # # # # @@ -59,7 +53,7 @@ PROGDEFINES = -mnoshort -Wall -Wmissing-prototypes -fno-strict-aliasing endif -ifeq ($(TARGET),generic) +ifeq ($(TARGET),unix) OPT_CFLAGS = -O2 endif @@ -81,11 +75,6 @@ SRC_HFILES += ../include/nvram.h endif -ifeq ($(TIMERS_ENABLE),YES) -OBJS += $(TARGET)_timer.o -endif - - CFLAGS = SUB_OPT_CFLAGS all: canfestival