From ac07e6b34fa68d531a9679a02000a4f0e4d56efb Mon Sep 17 00:00:00 2001
From: LEdoian <tap9701@gmail.com>
Date: Fri, 15 Apr 2016 16:20:55 +0200
Subject: [PATCH] Renamed files

---
 Makefile       | 24 ++++++++++--------------
 Makefile.final | 15 ---------------
 Makefile.old   | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 Makefile.final
 create mode 100644 Makefile.old

diff --git a/Makefile b/Makefile
index ef6eb48..2837986 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,15 @@
-TARGET = main
-GCCFLAGS = -L../../libopencm3/libopencm3/include -DSTM32F1
-LIBS = ../../libopencm3/libopencm3/lib/libopencm3_stm32f1.a
+OPENCM3_DIR = /home/ledoian/Development/STM32/libopencm3/libopencm3
+#OPENCM3_DIR = /home/ledoian/libopencm3-examples/libopencm3-examples/libopencm3
 
-.DEFAULT: compile link
-
-.PHONY: compile flash all link
-
-all: compile link flash
-
-compile: $(TARGET).o
+EXAMPLE_DIR = /home/ledoian/Development/STM32/libopencm3-examples/libopencm3-examples/examples/stm32/f1/stm32vl-discovery
+#EXAMPLE_DIR = /home/ledoian/libopencm3-examples/libopencm3-examples/examples/stm32/f1/stm32vl-discovery
 
 %.o: %.c
-	arm-none-eabi-gcc -c $(GCCFLAGS) $*.c -o $*.o
+	arm-none-eabi-gcc -Os -g -Wextra -fno-common -ffunction-sections -fdata-sections -MD -Wall -Wundef -I $(OPENCM3_DIR)/include -D STM32F1 -mthumb -mcpu=cortex-m3 -msoft-float -mfix-cortex-m3-ldrd -c $*.c -o $*.o
+
+%.elf: %.o
+	arm-none-eabi-gcc --static -nostartfiles -L $(OPENCM3_DIR)/lib -T $(EXAMPLE_DIR)/stm32vl-discovery.ld -Wl,-Map=$*.map -Wl,--gc-sections -mthumb -mcpu=cortex-m3 -msoft-float -mfix-cortex-m3-ldrd $*.o -l opencm3_stm32f1 -Wl,--start-group -lc -lgcc -lnosys -Wl,--end-group -o $*.elf
 
-link: $(TARGET).bin
+%.bin: %.elf
+	arm-none-eabi-objcopy -Obinary $*.elf $*.bin
 
-%.bin: %.o $(LIBS)
-	arm-none-eabi-gcc $^ -o $*.bin
diff --git a/Makefile.final b/Makefile.final
deleted file mode 100644
index 2837986..0000000
--- a/Makefile.final
+++ /dev/null
@@ -1,15 +0,0 @@
-OPENCM3_DIR = /home/ledoian/Development/STM32/libopencm3/libopencm3
-#OPENCM3_DIR = /home/ledoian/libopencm3-examples/libopencm3-examples/libopencm3
-
-EXAMPLE_DIR = /home/ledoian/Development/STM32/libopencm3-examples/libopencm3-examples/examples/stm32/f1/stm32vl-discovery
-#EXAMPLE_DIR = /home/ledoian/libopencm3-examples/libopencm3-examples/examples/stm32/f1/stm32vl-discovery
-
-%.o: %.c
-	arm-none-eabi-gcc -Os -g -Wextra -fno-common -ffunction-sections -fdata-sections -MD -Wall -Wundef -I $(OPENCM3_DIR)/include -D STM32F1 -mthumb -mcpu=cortex-m3 -msoft-float -mfix-cortex-m3-ldrd -c $*.c -o $*.o
-
-%.elf: %.o
-	arm-none-eabi-gcc --static -nostartfiles -L $(OPENCM3_DIR)/lib -T $(EXAMPLE_DIR)/stm32vl-discovery.ld -Wl,-Map=$*.map -Wl,--gc-sections -mthumb -mcpu=cortex-m3 -msoft-float -mfix-cortex-m3-ldrd $*.o -l opencm3_stm32f1 -Wl,--start-group -lc -lgcc -lnosys -Wl,--end-group -o $*.elf
-
-%.bin: %.elf
-	arm-none-eabi-objcopy -Obinary $*.elf $*.bin
-
diff --git a/Makefile.old b/Makefile.old
new file mode 100644
index 0000000..ef6eb48
--- /dev/null
+++ b/Makefile.old
@@ -0,0 +1,19 @@
+TARGET = main
+GCCFLAGS = -L../../libopencm3/libopencm3/include -DSTM32F1
+LIBS = ../../libopencm3/libopencm3/lib/libopencm3_stm32f1.a
+
+.DEFAULT: compile link
+
+.PHONY: compile flash all link
+
+all: compile link flash
+
+compile: $(TARGET).o
+
+%.o: %.c
+	arm-none-eabi-gcc -c $(GCCFLAGS) $*.c -o $*.o
+
+link: $(TARGET).bin
+
+%.bin: %.o $(LIBS)
+	arm-none-eabi-gcc $^ -o $*.bin