/elec/propeller-clock : revision 58

To get this branch, use:

bzr branch
http://bzr.ed.am/elec/propeller-clock

« back to all changes in this revision

Viewing changes to arduino.mk

Committer: edam
Date: 2012-02-25 14:54:33 UTC
Revision ID: edam@waxworlds.org-20120225145433-kih8qs45x05cum46

removed Bounce library and updated/fixed new code

files added:
src/drawer.cc

src/drawer.h

src/major_mode.h

src/minor_mode.cc

src/minor_mode.h

src/mode_switcher.cc

src/mode_switcher.h

src/utility

src/utility/Jamfile

src/utility/Makefile

src/utility/README.md

src/utility/StandardCplusplus.h

src/utility/algorithm

src/utility/algorithm.cpp

src/utility/associative_base

src/utility/associative_base.cpp

src/utility/basic_definitions

src/utility/bitset

src/utility/bitset.cpp

src/utility/cassert

src/utility/cctype

src/utility/cerrno

src/utility/cfloat

src/utility/char_traits

src/utility/char_traits.cpp

src/utility/climits

src/utility/clocale

src/utility/cmath

src/utility/complex

src/utility/complex.cpp

src/utility/csetjmp

src/utility/csignal

src/utility/cstdarg

src/utility/cstddef

src/utility/cstdio

src/utility/cstdlib

src/utility/cstring

src/utility/ctime

src/utility/cwchar

src/utility/cwctype

src/utility/del_op.cpp

src/utility/del_opnt.cpp

src/utility/del_opv.cpp

src/utility/del_opvnt.cpp

src/utility/deque

src/utility/deque.cpp

src/utility/eh_alloc.cpp

src/utility/eh_globals.cpp

src/utility/exception

src/utility/exception.cpp

src/utility/fstream

src/utility/fstream.cpp

src/utility/func_exception

src/utility/func_exception.cpp

src/utility/functional

src/utility/iomanip

src/utility/iomanip.cpp

src/utility/ios

src/utility/ios.cpp

src/utility/iosfwd

src/utility/iostream

src/utility/iostream.cpp

src/utility/istream

src/utility/istream.cpp

src/utility/istream_helpers

src/utility/iterator

src/utility/iterator.cpp

src/utility/iterator_base

src/utility/limits

src/utility/limits.cpp

src/utility/list

src/utility/list.cpp

src/utility/locale

src/utility/locale.cpp

src/utility/map

src/utility/map.cpp

src/utility/memory

src/utility/new

src/utility/new_handler.cpp

src/utility/new_op.cpp

src/utility/new_opnt.cpp

src/utility/new_opv.cpp

src/utility/new_opvnt.cpp

src/utility/numeric

src/utility/numeric.cpp

src/utility/ostream

src/utility/ostream.cpp

src/utility/ostream_helpers

src/utility/queue

src/utility/queue.cpp

src/utility/serstream

src/utility/set

src/utility/set.cpp

src/utility/sstream

src/utility/sstream.cpp

src/utility/stack

src/utility/stack.cpp

src/utility/stdexcept

src/utility/stdexcept.cpp

src/utility/streambuf

src/utility/streambuf.cpp

src/utility/string

src/utility/string.cpp

src/utility/string_iostream

src/utility/support

src/utility/support.cpp

src/utility/system_configuration.h

src/utility/type_traits

src/utility/typeinfo

src/utility/typeinfo.cpp

src/utility/uartbuf

src/utility/unwind-cxx.h

src/utility/utility.cpp

src/utility/utility.h

src/utility/valarray

src/utility/valarray.cpp

src/utility/vector

src/utility/vector.cpp

files removed:
src/common.cc

src/common.h

src/digital_clock.cc

src/digital_clock.h

src/settings_mode.cc

src/settings_mode.h

src/text.cc

src/text.h

src/text_renderer.cc

src/text_renderer.h

src/util/PString.cpp

src/util/PString.h

test/rtc-test

test/rtc-test/Makefile

test/rtc-test/rtc-ds1307.ino

test/rtc-test/util

test/rtc-test/util/DS1307.cpp

test/rtc-test/util/DS1307.h

files renamed:
src/analogue_clock.cc => src/analogue_clock_mode.cc

src/analogue_clock.h => src/analogue_clock_mode.h

src/propeller-clock.cc => src/propeller-clock.ino

src/test_pattern.cc => src/test_mode.cc

src/test_pattern.h => src/test_mode.h

files modified:
.bzrignore

arduino.mk

electronics-information

notes

src/Makefile

src/button.cc

src/button.h

src/config.h

src/time.cc

src/time.h

Show diffs side-by-side

added added

removed removed

arduino.mk

117

# when you run make:

118

119

# all This is the default if no goal is specified. It builds the

120

# target.

120

# target and uploads it.

121

122

# target Builds the target.

123

131

# monitor Start `screen` on the serial device. This is meant to be an

132

# equivalent to the Arduino serial monitor.

133

134

# size Displays size information about the bulit target.

135

136

134

# <file> Builds the specified file, either an object file or the target,

137

135

# from those that that would be built for the project.

138

136

#_______________________________________________________________________________

171

169

$(wildcard $(addprefix utility/, *.c *.cc *.cpp))

172

170

173

171

# automatically determine included libraries

174

LIBRARIES := $(filter $(notdir $(wildcard $(ARDUINODIR)/libraries/*)), \

172

ARDUINOLIBSAVAIL := $(notdir $(wildcard $(ARDUINODIR)/libraries/*))

173

LIBRARIES := $(filter $(ARDUINOLIBSAVAIL), \

175

174

$(shell sed -ne "s/^ *\# *include *[<\"]$.*$\.h[>\"]/\1/p" $(SOURCES)))

176

175

177

176

endif

192

191

AR := $(call findsoftware,avr-ar)

193

192

OBJCOPY := $(call findsoftware,avr-objcopy)

194

193

AVRDUDE := $(call findsoftware,avrdude)

195

AVRSIZE := $(call findsoftware,avr-size)

196

194

197

195

# files

198

196

TARGET := $(if $(TARGET),$(TARGET),a.out)

199

197

OBJECTS := $(addsuffix .o, $(basename $(SOURCES)))

200

DEPFILES := $(patsubst %, .dep/%.dep, $(SOURCES))

201

ARDUINOCOREDIR := $(ARDUINODIR)/hardware/arduino/cores/arduino

202

ARDUINOLIB := .lib/arduino.a

203

ARDUINOLIBLIBSDIR := $(ARDUINODIR)/libraries

204

ARDUINOLIBLIBSPATH := $(foreach lib, $(LIBRARIES), \

205

$(ARDUINODIR)/libraries/$(lib)/ $(ARDUINODIR)/libraries/$(lib)/utility/ )

206

ARDUINOLIBOBJS := $(foreach dir, $(ARDUINOCOREDIR) $(ARDUINOLIBLIBSPATH), \

207

$(patsubst %, .lib/%.o, $(wildcard $(addprefix $(dir)/, *.c *.cpp))))

198

ARDUINOSRCDIR := $(ARDUINODIR)/hardware/arduino/cores/arduino

199

ARDUINOLIBSDIR := $(ARDUINODIR)/libraries

200

ARDUINOLIB := _arduino.a

201

ARDUINOLIBTMP := $(ARDUINOLIB).tmp

202

ARDUINOLIBOBJS := $(patsubst %, $(ARDUINOLIBTMP)/%.o, $(basename $(notdir \

203

$(wildcard $(addprefix $(ARDUINOSRCDIR)/, *.c *.cpp)))))

204

ARDUINOLIBOBJS += $(foreach lib, $(LIBRARIES), \

205

$(patsubst %, $(ARDUINOLIBTMP)/%.o, $(basename $(notdir \

206

$(wildcard $(addprefix $(ARDUINOLIBSDIR)/$(lib)/, *.c *.cpp)) \

207

$(wildcard $(addprefix $(ARDUINOLIBSDIR)/$(lib)/utility/, *.c *.cpp)) ))))

208

ifeq "$(AVRDUDECONF)" ""

209

ifeq "$(AVRDUDE)" "$(ARDUINODIR)/hardware/tools/avr/bin/avrdude"

210

AVRDUDECONF := $(ARDUINODIR)/hardware/tools/avr/etc/avrdude.conf

249

CPPFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums

250

CPPFLAGS += -mmcu=$(BOARD_BUILD_MCU)

251

CPPFLAGS += -DF_CPU=$(BOARD_BUILD_FCPU) -DARDUINO=$(ARDUINOCONST)

252

CPPFLAGS += -I. -Iutil -Iutility -I$(ARDUINOCOREDIR)

252

CPPFLAGS += -I. -Iutil -Iutility -I$(ARDUINOSRCDIR)

253

CPPFLAGS += -I$(ARDUINODIR)/hardware/arduino/variants/$(BOARD_BUILD_VARIANT)/

254

CPPFLAGS += $(addprefix -I$(ARDUINODIR)/libraries/, $(LIBRARIES))

255

CPPFLAGS += $(patsubst %, -I$(ARDUINODIR)/libraries/%/utility, $(LIBRARIES))

256

CPPDEPFLAGS = -MMD -MP -MF .dep/$<.dep

257

CPPINOFLAGS := -x c++ -include $(ARDUINOCOREDIR)/Arduino.h

258

256

AVRDUDEFLAGS := $(addprefix -C , $(AVRDUDECONF)) -DV

259

257

AVRDUDEFLAGS += -p $(BOARD_BUILD_MCU) -P $(SERIALDEV)

260

258

AVRDUDEFLAGS += -c $(BOARD_UPLOAD_PROTOCOL) -b $(BOARD_UPLOAD_SPEED)

263

261

# figure out which arg to use with stty

264

262

STTYFARG := $(shell stty --help > /dev/null 2>&1 && echo -F || echo -f)

265

263

266

# include dependencies

267

ifneq "$(MAKECMDGOALS)" "clean"

268

-include $(DEPFILES)

269

endif

270

271

264

# default rule

272

265

.DEFAULT_GOAL := all

273

266

274

267

#_______________________________________________________________________________

275

268

# RULES

276

269

277

.PHONY: all target upload clean boards monitor size

270

.PHONY: all target upload clean boards monitor

278

271

279

all: target

272

all: target upload

280

273

281

274

target: $(TARGET).hex

282

275

294

287

clean:

295

288

rm -f $(OBJECTS)

296

289

rm -f $(TARGET).elf $(TARGET).hex $(ARDUINOLIB) *~

297

rm -rf .lib .dep

290

rm -rf $(ARDUINOLIBTMP)

298

291

299

292

boards:

300

293

@echo Available values for BOARD:

313

306

echo; }

314

307

screen $(SERIALDEV)

315

308

316

size: $(TARGET).elf

317

echo && $(AVRSIZE) --format=avr --mcu=$(BOARD_BUILD_MCU) $(TARGET).elf

318

319

309

# building the target

320

310

321

311

$(TARGET).hex: $(TARGET).elf

326

316

$(TARGET).elf: $(ARDUINOLIB) $(OBJECTS)

327

317

$(CC) $(LINKFLAGS) $(OBJECTS) $(ARDUINOLIB) -o $@

328

318

329

%.o: %.c

330

mkdir -p .dep/$(dir $<)

331

$(COMPILE.c) $(CPPDEPFLAGS) -o $@ $<

332

333

%.o: %.cpp

334

mkdir -p .dep/$(dir $<)

335

$(COMPILE.cpp) $(CPPDEPFLAGS) -o $@ $<

336

337

%.o: %.cc

338

mkdir -p .dep/$(dir $<)

339

$(COMPILE.cpp) $(CPPDEPFLAGS) -o $@ $<

340

341

%.o: %.C

342

mkdir -p .dep/$(dir $<)

343

$(COMPILE.cpp) $(CPPDEPFLAGS) -o $@ $<

344

345

319

%.o: %.ino

346

mkdir -p .dep/$(dir $<)

347

$(COMPILE.cpp) $(CPPDEPFLAGS) -o $@ $(CPPINOFLAGS) $<

320

$(COMPILE.cpp) -o $@ -x c++ -include $(ARDUINOSRCDIR)/Arduino.h $<

348

321

349

322

%.o: %.pde

350

mkdir -p .dep/$(dir $<)

351

$(COMPILE.cpp) $(CPPDEPFLAGS) -o $@ -x c++ -include $(ARDUINOCOREDIR)/Arduino.h $<

323

$(COMPILE.cpp) -o $@ -x c++ -include $(ARDUINOSRCDIR)/Arduino.h $<

352

324

353

325

# building the arduino library

354

326

355

327

$(ARDUINOLIB): $(ARDUINOLIBOBJS)

356

328

$(AR) rcs $@ $?

357

358

.lib/%.c.o: %.c

359

mkdir -p $(dir $@)

360

$(COMPILE.c) -o $@ $<

361

362

.lib/%.cpp.o: %.cpp

363

mkdir -p $(dir $@)

364

$(COMPILE.cpp) -o $@ $<

365

366

.lib/%.cc.o: %.cc

367

mkdir -p $(dir $@)

368

$(COMPILE.cpp) -o $@ $<

369

370

.lib/%.C.o: %.C

371

mkdir -p $(dir $@)

329

rm -rf $(ARDUINOLIBTMP)

330

331

.INTERMEDIATE: $(ARDUINOLIBOBJS)

332

333

$(ARDUINOLIBTMP)/%.o: $(ARDUINOSRCDIR)/%.c

334

@test -d $(ARDUINOLIBTMP) || mkdir $(ARDUINOLIBTMP)

335

$(COMPILE.c) -o $@ $<

336

337

$(ARDUINOLIBTMP)/%.o: $(ARDUINOSRCDIR)/%.cpp

338

@test -d $(ARDUINOLIBTMP) || mkdir $(ARDUINOLIBTMP)

339

$(COMPILE.cpp) -o $@ $<

340

341

$(ARDUINOLIBTMP)/%.o: $(ARDUINODIR)/libraries/*/%.c

342

@test -d $(ARDUINOLIBTMP) || mkdir $(ARDUINOLIBTMP)

343

$(COMPILE.c) -o $@ $<

344

345

$(ARDUINOLIBTMP)/%.o: $(ARDUINODIR)/libraries/*/%.cpp

346

@test -d $(ARDUINOLIBTMP) || mkdir $(ARDUINOLIBTMP)

347

$(COMPILE.cpp) -o $@ $<

348

349

$(ARDUINOLIBTMP)/%.o: $(ARDUINODIR)/libraries/*/utility/%.c

350

@test -d $(ARDUINOLIBTMP) || mkdir $(ARDUINOLIBTMP)

351

$(COMPILE.c) -o $@ $<

352

353

$(ARDUINOLIBTMP)/%.o: $(ARDUINODIR)/libraries/*/utility/%.cpp

354

@test -d $(ARDUINOLIBTMP) || mkdir $(ARDUINOLIBTMP)

372

355

$(COMPILE.cpp) -o $@ $<

Older »