duino/Makefile in subduino-0.2.1 vs duino/Makefile in subduino-0.2.2

- old
+ new

@@ -13,21 +13,20 @@ # # CONFIGURATION # TARGET = duino ARDUINO_DIR = /usr/share/arduino -ARDUINO_LIBS = Messenger +# ARDUINO_LIBS = ExtraLib MCU = atmega328p F_CPU = 16000000 ARDUINO_PORT = /dev/ttyUSB* # Linux AVR_TOOLS_PATH = /usr/bin AVRDUDE_CONF = /usr/share/arduino/hardware/tools/avrdude.conf -# INC_DIRS = ./vendor/Messenger # Hopefully these will be self-explanatory but in case they're not: # # ARDUINO_DIR - Where the Arduino software has been unpacked # TARGET - The basename used for the final files. Canonically @@ -134,10 +133,10 @@ # core sources ifeq ($(strip $(NO_CORE)),) ifdef ARDUINO_CORE_PATH CORE_C_SRCS = $(wildcard $(ARDUINO_CORE_PATH)/*.c) CORE_CPP_SRCS = $(wildcard $(ARDUINO_CORE_PATH)/*.cpp) -EXTRA_CPP_SRCS = $(wildcard $(ARDUINO_LIB_PATH)/Messenger/*.cpp) +# EXTRA_CPP_SRCS = $(wildcard $(ARDUINO_LIB_PATH)/ExtraLib/*.cpp) CORE_OBJ_FILES = $(CORE_C_SRCS:.c=.o) $(CORE_CPP_SRCS:.cpp=.o) $(EXTRA_CPP_SRCS:.cpp=.o) CORE_OBJS = $(patsubst $(ARDUINO_CORE_PATH)/%, $(OBJDIR)/%,$(CORE_OBJ_FILES)) endif endif