Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Makefile: Made it so that the default set of libraries is defined at …

…the top of libs.mk instead of an obscure place inside of apps.mk.
  • Loading branch information...
commit 3ecaeafb89e5a7f5c566f68fa91482a0ebbb4a4f 1 parent 718b5d6
@DavidEGrayson DavidEGrayson authored
Showing with 4 additions and 1 deletion.
  1. +1 −1  apps.mk
  2. +3 −0  libraries/libs.mk
View
2  apps.mk
@@ -2,7 +2,7 @@
define APP_template
APP_RELS := $$(patsubst %.c,%.rel, $$(wildcard apps/$(1)/*.c)) $$(patsubst %.s,%.rel, $$(wildcard apps/$(1)/*.s))
-APP_LIBS := dma.lib radio_com.lib radio_link.lib radio_mac.lib radio_registers.lib random.lib uart.lib usb.lib usb_cdc_acm.lib wixel.lib adc.lib gpio.lib
+APP_LIBS := $$(DEFAULT_LIBRARIES)
-include apps/$(1)/options.mk
APP_LIBS := $$(foreach lib, $$(APP_LIBS), libraries/lib/$$(lib))
View
3  libraries/libs.mk
@@ -1,3 +1,6 @@
+DEFAULT_LIBRARIES = radio_com.lib radio_link.lib radio_mac.lib radio_registers.lib \
+ random.lib uart.lib usb.lib usb_cdc_acm.lib wixel.lib adc.lib gpio.lib dma.lib
+
# This template defines the things we want to add to the makefile for each library.
define LIB_template
Please sign in to comment.
Something went wrong with that request. Please try again.