summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandroColomar <colomar.6.4.3@gmail.com>2019-01-13 01:20:27 +0100
committerAlejandroColomar <colomar.6.4.3@gmail.com>2019-01-13 01:20:27 +0100
commita399079cb58482b82425bd35e8539006a7c769ae (patch)
treeca49229ee7b9a9d1fe04b83864453660ceb99a27
parent975863c4d897e1187b28afcfa2bdfdbf7bc872ee (diff)
Minor changes
-rw-r--r--Makefile4
-rw-r--r--bin/Makefile10
-rwxr-xr-xtmp/Makefile4
3 files changed, 10 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index a13e209..57844d0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
#!/usr/bin/make -f
VERSION = 1
-PATCHLEVEL = .0
+PATCHLEVEL = .2
SUBLEVEL =
-EXTRAVERSION =
+EXTRAVERSION = ~a1
NAME = little-bird
export VERSION
diff --git a/bin/Makefile b/bin/Makefile
index e22f2fb..7bd9dbc 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -24,9 +24,9 @@ MAIN_OBJS = $(patsubst %,$(TMP_DIR)/%,$(MAIN_OBJ_MODULES))
MAIN_LIB_LIBALX = libalx-base.a
MAIN_LIB_DRIVERS = libstm32l4.a
MAIN_LIB_MODULES = \
- libstm32l4-modules-test.a \
- libstm32l4-modules-dev.a \
- libstm32l4-modules-base.a
+ libstm32l4-modules-test.a \
+ libstm32l4-modules-dev.a \
+ libstm32l4-modules-base.a
MAIN_LIBS = \
$(patsubst %,$(LIBALX_LIB_DIR)/%,$(MAIN_LIB_LIBALX)) \
$(patsubst %,$(DRIVERS_LIB_DIR)/%,$(MAIN_LIB_DRIVERS)) \
@@ -75,8 +75,8 @@ size: $(PROJECT_NAME).elf
clean:
- @echo " RM $(ALL)"
- $(Q)rm -f $(ALL)
+ @echo " RM bin"
+ $(Q)rm -f *.elf *.hex *.bin *.lst *.map
################################################################################
######## End of file ###########################################################
diff --git a/tmp/Makefile b/tmp/Makefile
index e132ec8..a995be5 100755
--- a/tmp/Makefile
+++ b/tmp/Makefile
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+
+################################################################################
# directories
STM32_CMSIS_DIR = $(DRIVERS_DIR)/CMSIS/
@@ -16,8 +18,8 @@ SRC_DIR = $(MAIN_DIR)/src/
INC_DIR = $(MAIN_DIR)/inc/
DEP_DIR = $(MAIN_DIR)/dep/
+################################################################################
# dependencies
-
ALL = \
system_stm32l4xx.o stm32l4xx_it.o main.o \
ctrl.o actuators.o test.o