From 786dccd2bc0946d48b8a2758ef2c607678bc8dd9 Mon Sep 17 00:00:00 2001
From: XaviDCR92 <xavi.dcr@gmail.com>
Date: Fri, 8 Sep 2017 18:39:22 +0200
Subject: Removed Building and GameStructures modules. Restructured SW for Unit
 and Player, still a lot TODO

---
 Libs/libarduino/Makefile | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'Libs/libarduino')

diff --git a/Libs/libarduino/Makefile b/Libs/libarduino/Makefile
index 04253ec..eb324b6 100644
--- a/Libs/libarduino/Makefile
+++ b/Libs/libarduino/Makefile
@@ -2,28 +2,31 @@ include ../../Makefile.cfg
 
 PROJECT=arduino
 LIBNAME=lib$(PROJECT).a
-INCDIR=../../../include/$(PROJECT)
+
+INCLUDE_FOLDER=../../../include/$(PROJECT)
 LIBS_FOLDER=../../../lib
 
 OBJECTS= wiring.o wiring_analog.o wiring_digital.o \
         wiring_pulse.o wiring_shift.o HardwareSerial.o Print.o   \
         Tone.o WMath.o WString.o WInterrupts.o forward.o SPI.o
 
-default: $(OBJECTS)
-	avr-ar rcs $(LIBNAME) $^
-	mkdir -p $(INCDIR)
-	cp *.h $(INCDIR)/
-	mkdir -p $(LIBS_FOLDER)
-	mv $(LIBNAME) $(LIBS_FOLDER)
-	avr-size $(LIBS_FOLDER)/$(LIBNAME)
+default: $(LIBNAME)
+	cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
 	
+$(LIBNAME): $(OBJECTS)
+	avr-ar rcs $@ $^
+	mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
+	mv $@ $(LIBS_FOLDER)
+	avr-size $(LIBS_FOLDER)/$@
+
 %.o: %.cpp
-	$(CXX) $< -o $@ $(DEFINE) $(INCLUDE)  $(CC_FLAGS)
+	$(CXX) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
 	
 %.o: %.c
-	$(CC) $< -o $@ $(DEFINE) $(INCLUDE) $(CC_FLAGS)
+	$(CC) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
 
 clean:
-	rm -f *.o
+	rm -f $(OBJECTS)
+	rm -f $(LIBS_FOLDER)/$(LIBNAME)
 
-.PHONY: default
+.PHONY: default clean
-- 
cgit v1.2.3