reflected previous sd card fixes

Author: Parita

Makefile

@@ -5,25 +5,26 @@ CPU_SPEED=-DF_CPU=16000000UL
 VARIANTS=standard
 
 SPI_PATH=libraries/SPI
+SD_PATH=libraries/SD
 PINS_PATH=hardware/arduino/variants/$(VARIANTS)
 WIRING_PATH=hardware/arduino/cores/arduino
 ETHERNET_PATH=libraries/Ethernet
 SOFTWARE_SERIAL_PATH=libraries/SoftwareSerial
 
-STATIC_LIBRARIES=libarduino.a libspi.a libethernet.a libsoftwareserial.a libstring.a
+STATIC_LIBRARIES=libarduino.a libspi.a libethernet.a libsd.a librawsd.a libsoftwareserial.a libstring.a
 
 HEADER_PATHS=-I$(SPI_PATH) -I$(PINS_PATH) -I$(WIRING_PATH) -I$(ETHERNET_PATH) \
-	-I$(ETHERNET_PATH)/utility -I$(SOFTWARE_SERIAL_PATH)
+	-I$(ETHERNET_PATH)/utility -I$(SD_PATH) -I$(SD_PATH)/utility -I$(SOFTWARE_SERIAL_PATH)
 ENABLE_FLAGS=-DARDUINO_WIRING_DIGITAL -DARDUINO_LITE
 
-STRING_CFLAGS=$(MCU) $(CPU_SPEED) -DARDUINO_WIRING_DIGITAL -DARDUINO_STRING -Os -w -funsigned-char \
+CFLAGS=$(MCU) $(CPU_SPEED) $(ENABLE_FLAGS) -Os -w -funsigned-char \
 	-funsigned-bitfields -fpack-struct -fshort-enums
 
-CFLAGS=$(MCU) $(CPU_SPEED) $(ENABLE_FLAGS) -Os -w -funsigned-char \
+STRING_CFLAGS=$(MCU) $(CPU_SPEED) -DARDUINO_WIRING_DIGITAL -DARDUINO_STRING -Os -w -funsigned-char \
 	-funsigned-bitfields -fpack-struct -fshort-enums
 
 ARDUINO_FILES=wiring.c wiring_digital.c HardwareSerial.cpp \
-	WInterrupts.c IPAddress.cpp Print.cpp new.cpp
+	WInterrupts.c Print.cpp IPAddress.cpp new.cpp
 
 ETHERNET_FILES=Ethernet.cpp EthernetUdp.cpp utility/socket.cpp \
 	utility/w5100.cpp 
@@ -39,9 +40,16 @@ ARDUINO_OBJECTS1=$(filter %.cpp, $(ARDUINO_SOURCES))
 ARDUINO_OBJECTS2=$(filter %.c, $(ARDUINO_SOURCES))
 ARDUINO_OBJECTS=$(ARDUINO_OBJECTS1:.cpp=.o) $(ARDUINO_OBJECTS2:.c=.o)
 
+.phony: clean default
+
 default: $(STATIC_LIBRARIES)
 
+clean:
+	echo ------------- CLEAN
+	rm -f libarduino.a libspi.a libethernet.a libsd.a librawsd.a libsoftwareserial.a libstring.a
+
 libarduino.a: $(ARDUINO_OBJECTS)	
+	echo ------------- LIBARDUINO
 	avr-ar rcs $@ $(ARDUINO_OBJECTS)
 	rm $(ARDUINO_OBJECTS)
 
@@ -50,6 +58,18 @@ libspi.a: $(SPI_PATH)/SPI.cpp
 	avr-ar rcs $@ $(SPI_PATH)/SPI.o
 	rm $(SPI_PATH)/SPI.o	
 
+libsd.a: $(SD_PATH)/SD.cpp librawsd.a
+	@echo --------------------- LIB SD
+	$(CXX) $(HEADER_PATHS) $< $(CFLAGS) -c -o $(SD_PATH)/SD.o
+	avr-ar rcs $@ $(SD_PATH)/SD.o
+	rm $(SD_PATH)/SD.o
+
+librawsd.a: $(SD_PATH)/utility/Sd2Card.cpp
+	@echo --------------------- LIBRAWSD
+	$(CXX) $(HEADER_PATHS) $< $(CFLAGS) -c -o $(SD_PATH)/utility/SD2Card.o
+	avr-ar rcs $@ $(SD_PATH)/utility/SD2Card.o
+	rm $(SD_PATH)/utility/SD2Card.o
+
 libstring.a: $(WIRING_PATH)/WString.cpp 
 	$(CXX) $(HEADER_PATHS) $< $(STRING_CFLAGS) -c -o $(WIRING_PATH)/WString.o
 	avr-ar rcs $@ $(WIRING_PATH)/WString.o