EMTime/libopencm3-examples
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make: respect OPENCM3_DIR variable

Browse Source 
When checking for the existing of the library, respect the variable
that's defined instead of checking a hardcoded path.
This commit is contained in:
Karl Palsson
2015-10-21 15:15:56 +00:00
parent 393fe8e449
commit 3a275fb601
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -53,7 +53,7 @@ images: build
build: lib examples build: lib examples
lib: lib:
$(Q)if [ ! "`ls -A libopencm3`" ] ; then \ $(Q)if [ ! "`ls -A $(OPENCM3_DIR)`" ] ; then \
printf "######## ERROR ########\n"; \ printf "######## ERROR ########\n"; \
printf "\tlibopencm3 is not initialized.\n"; \ printf "\tlibopencm3 is not initialized.\n"; \
printf "\tPlease run:\n"; \ printf "\tPlease run:\n"; \
@@ -63,7 +63,7 @@ lib:
printf "######## ERROR ########\n"; \ printf "######## ERROR ########\n"; \
exit 1; \ exit 1; \
fi fi
$(Q)$(MAKE) -C libopencm3 $(Q)$(MAKE) -C $(OPENCM3_DIR)
EXAMPLE_DIRS:=$(sort $(dir $(wildcard $(addsuffix /*/*/Makefile,$(addprefix examples/,$(TARGETS)))))) EXAMPLE_DIRS:=$(sort $(dir $(wildcard $(addsuffix /*/*/Makefile,$(addprefix examples/,$(TARGETS))))))
$(EXAMPLE_DIRS): lib $(EXAMPLE_DIRS): lib