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.
StephenBlackWasAlreadyTaken · Apr 13, 2011 · 3ecaeaf · 3ecaeaf
1 parent 718b5d6
commit 3ecaeaf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/apps.mk b/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))
 

diff --git a/libraries/libs.mk b/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