From b764612a79100271270012053bdb1e4302cd93b7 Mon Sep 17 00:00:00 2001
From: XaviDCR92 <xavi.dcr@gmail.com>
Date: Sat, 9 Sep 2017 12:57:49 +0200
Subject: [PATCH] Renamed *Spr.c files to *Spr.inc. Adjusted dependencies for
 subMakes.

---
 BarracksSpr.c => BarracksSpr.inc | 2 +-
 Libs/libarduino/Makefile         | 6 +++---
 Libs/libgamebuino/Makefile       | 6 +++---
 Libs/petit_fatfs/Makefile        | 6 +++---
 Libs/tinyFAT/Makefile            | 6 +++---
 PeasantSpr.c => PeasantSpr.inc   | 0
 Unit.c                           | 6 +++---
 7 files changed, 16 insertions(+), 16 deletions(-)
 rename BarracksSpr.c => BarracksSpr.inc (99%)
 rename PeasantSpr.c => PeasantSpr.inc (100%)

diff --git a/BarracksSpr.c b/BarracksSpr.inc
similarity index 99%
rename from BarracksSpr.c
rename to BarracksSpr.inc
index 56a36a5..5763273 100644
--- a/BarracksSpr.c
+++ b/BarracksSpr.inc
@@ -27,7 +27,7 @@ const uint8_t BarracksSpr_Data[] PROGMEM =
 	0x81,0x24,0x81,
 	0xFF,0xFF,0xFF,
 };
-//
+
 const uint8_t BarracksShadowSpr_Data[] PROGMEM =
 {
 	24 /* Width */, 24 /* Height */,
diff --git a/Libs/libarduino/Makefile b/Libs/libarduino/Makefile
index eb324b6..a3f5e1d 100644
--- a/Libs/libarduino/Makefile
+++ b/Libs/libarduino/Makefile
@@ -11,12 +11,12 @@ OBJECTS= wiring.o wiring_analog.o wiring_digital.o \
         Tone.o WMath.o WString.o WInterrupts.o forward.o SPI.o
 
 default: $(LIBNAME)
-	cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
-	
+
 $(LIBNAME): $(OBJECTS)
 	avr-ar rcs $@ $^
 	mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
-	mv $@ $(LIBS_FOLDER)
+	cp $@ $(LIBS_FOLDER)
+	cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
 	avr-size $(LIBS_FOLDER)/$@
 
 %.o: %.cpp
diff --git a/Libs/libgamebuino/Makefile b/Libs/libgamebuino/Makefile
index 75c49b8..28b1e4a 100644
--- a/Libs/libgamebuino/Makefile
+++ b/Libs/libgamebuino/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.cfg
 
 PROJECT=gamebuino
-LIBNAME=lib$(PROJECT)
+LIBNAME=lib$(PROJECT).a
 INCLUDE_FOLDERS=petit_fatfs tinyFAT arduino
 INCLUDE_FOLDER=../../../include
 LIBS_FOLDER = ../../../lib
@@ -17,13 +17,13 @@ default: $(LIBNAME)
 $(LIBNAME): $(OBJECTS)
 	avr-ar rcs $@ $^
 	mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
-	mv $@ $(LIBS_FOLDER)
+	cp $@ $(LIBS_FOLDER)
 	avr-size $(LIBS_FOLDER)/$@
 	cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
 
 %.o: %.cpp
 	$(CXX) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
-	
+
 %.o: %.c
 	$(CC) $< -o $@ $(INCLUDE) $(DEFINE) $(CC_FLAGS)
 
diff --git a/Libs/petit_fatfs/Makefile b/Libs/petit_fatfs/Makefile
index 07aaadc..0d95ef8 100644
--- a/Libs/petit_fatfs/Makefile
+++ b/Libs/petit_fatfs/Makefile
@@ -11,13 +11,13 @@ LIBNAME=lib$(PROJECT).a
 
 OBJECTS=mmc.o petit_fatfs.o pff.o
 
-default: $(LIBNAME) 
-	cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
+default: $(LIBNAME)
 	
 $(LIBNAME): $(OBJECTS)
 	avr-ar rcs $@ $^
 	mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
-	mv $@ $(LIBS_FOLDER)
+	cp $@ $(LIBS_FOLDER)
+	cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
 	avr-size $(LIBS_FOLDER)/$@
 
 %.o: %.cpp
diff --git a/Libs/tinyFAT/Makefile b/Libs/tinyFAT/Makefile
index df0650b..b99505f 100644
--- a/Libs/tinyFAT/Makefile
+++ b/Libs/tinyFAT/Makefile
@@ -11,12 +11,12 @@ LIBNAME=lib$(PROJECT).a
 OBJECTS=mmc.o tinyFAT.o
 
 default: $(LIBNAME)
-	cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
-	
+
 $(LIBNAME): $(OBJECTS)
 	avr-ar rcs $@ $^
 	mkdir -p $(INCLUDE_FOLDER)/$(PROJECT)
-	mv $@ $(LIBS_FOLDER)
+	cp $@ $(LIBS_FOLDER)
+	cp *.h $(INCLUDE_FOLDER)/$(PROJECT)
 	avr-size $(LIBS_FOLDER)/$@
 
 %.o: %.cpp
diff --git a/PeasantSpr.c b/PeasantSpr.inc
similarity index 100%
rename from PeasantSpr.c
rename to PeasantSpr.inc
diff --git a/Unit.c b/Unit.c
index 204c242..7d12666 100644
--- a/Unit.c
+++ b/Unit.c
@@ -3,8 +3,8 @@
  * **************************************/
 
 #include "Unit.h"
-#include "PeasantSpr.c"
-#include "BarracksSpr.c"
+#include "PeasantSpr.inc"
+#include "BarracksSpr.inc"
 
 /* **************************************
  * 	Defines								*
@@ -242,7 +242,7 @@ void UnitHandler(TYPE_UNIT* unitArray, size_t sz)
         {
             continue;
         }
-        
+
 
         bool bMoving = false;