Revision efe86ca9 modules/LightRing_1-2/Makefile

View differences:

modules/LightRing_1-2/Makefile
122 122
MCU := cortex-m3
123 123

  
124 124
# Module specific paths and directories.
125
MODULEDIR := .
126
CONFDIR := $(MODULEDIR)
127
ifeq ($(BUILDDIR),)
128
  BUILDDIR := $(PROJECT_PATH)/build
125
MODULE_DIR := .
126
CONFIG_DIR := $(MODULEDIR)
127
ifeq ($(BUILD_DIR),)
128
  BUILD_DIR := $(PROJECT_PATH)/build
129 129
endif
130
DEPDIR := $(dir $(BUILDDIR)).dep
130
DEP_DIR := $(dir $(BUILD_DIR)).dep
131 131

  
132 132
# Linker script.
133
LDSCRIPT= STM32F103xE.ld
133
LDSCRIPT = STM32F103xE.ld
134 134

  
135 135
# General AMiRo-OS files.
136
include ../../amiroos.mk
136
include ../../amiro-os.mk
137 137

  
138 138
# Module specific ChibiOS files.
139 139
include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
......
141 141
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
142 142

  
143 143
# Periphery LLDs.
144
AMIROOS_PERIPHERYLLD_INC += $(AMIROLLD)/drivers/AT24C01B/v1 \
145
                            $(AMIROLLD)/drivers/INA219/v1 \
146
                            $(AMIROLLD)/drivers/LED/v1 \
147
                            $(AMIROLLD)/drivers/MIC9404x/v1 \
148
                            $(AMIROLLD)/drivers/TLC5947/v1 \
149
			    $(AMIROLLD)/drivers/DW1000/v1
144
include $(AMIROLLD)/drivers/AT24C01B/v1/alld_AT24C01B.mk
145
include $(AMIROLLD)/drivers/INA219/v1/alld_INA219.mk
146
include $(AMIROLLD)/drivers/LED/v1/alld_LED.mk
147
include $(AMIROLLD)/drivers/MIC9404x/v1/alld_MIC9404x.mk
148
include $(AMIROLLD)/drivers/TLC5947/v1/alld_TLC5947.mk
149
include $(AMIROLLD)/drivers/DW1000/v1/alld_DW1000.mk
150 150

  
151 151
# Tests.
152 152
AMIROOS_TEST_INC += $(AMIROOS_TEST_DIR)periphery-lld/AT24C01B_v1 \
......
154 154
                    $(AMIROOS_TEST_DIR)periphery-lld/LED_v1 \
155 155
                    $(AMIROOS_TEST_DIR)periphery-lld/MIC9404x_v1 \
156 156
                    $(AMIROOS_TEST_DIR)periphery-lld/TLC5947_v1 \
157
		    $(AMIROOS_TEST_DIR)periphery-lld/DW1000_v1
157
                    $(AMIROOS_TEST_DIR)periphery-lld/DW1000_v1
158 158

  
159 159
# Module specific inclusion directories
160
MODULE_INC = $(MODULEDIR) \
161
             $(wildcard $(MODULEDIR)/test/*)
160
MODULE_INC = $(MODULE_DIR) \
161
             $(wildcard $(MODULE_DIR)/test/*)
162 162

  
163 163
# Module specific C source files.
164 164
MODULE_CSRC = $(wildcard $(MODULE_INC:%=%/*.[Cc]))
......
216 216
#                                                                              #
217 217

  
218 218
FLASH_MODULES = $(PROJECT)
219
FLASH_FILES = $(BUILDDIR)/$(PROJECT).$(FLASHTOOL_EXT)
219
FLASH_FILES = $(BUILD_DIR)/$(PROJECT).$(FLASHTOOL_EXT)
220 220

  
221 221
flash: $(FLASH_FILES)
222 222
	$(info )

Also available in: Unified diff