Changeset 1913
- Timestamp:
- 11/07/08 23:21:30 (2 months ago)
- Files:
-
- trunk/Makefile (modified) (1 diff)
- trunk/Makefile.test (modified) (1 diff)
- trunk/examples (moved) (moved from trunk/app)
- trunk/examples/at91sam7s/at91sam7s.mk (modified) (2 diffs)
- trunk/examples/demo/demo.mk (modified) (2 diffs)
- trunk/examples/lm3s1968/lm3s1968.mk (modified) (2 diffs)
- trunk/examples/randpool/randpool_demo.mk (modified) (2 diffs)
- trunk/examples/test/armtest.mk (modified) (2 diffs)
- trunk/examples/test/avrtest.mk (modified) (2 diffs)
- trunk/examples/triface/triface.mk (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Makefile
r1803 r1913 15 15 16 16 #Include subtargets 17 include app/demo/demo.mk18 #include app/at91sam7s/at91sam7s.mk19 #include app/triface/triface.mk17 include examples/demo/demo.mk 18 #include examples/at91sam7s/at91sam7s.mk 19 #include examples/triface/triface.mk 20 20 21 21 include bertos/rules.mk trunk/Makefile.test
r1754 r1913 6 6 7 7 include bertos/config.mk 8 include ./ app/test/avrtest.mk9 include ./ app/test/armtest.mk8 include ./examples/test/avrtest.mk 9 include ./examples/test/armtest.mk 10 10 include bertos/rules.mk trunk/examples/at91sam7s/at91sam7s.mk
r1716 r1913 17 17 18 18 at91sam7s_CSRC = \ 19 app/at91sam7s/at91sam7s.c \19 examples/at91sam7s/at91sam7s.c \ 20 20 bertos/drv/timer.c \ 21 21 bertos/drv/ser.c \ … … 39 39 40 40 at91sam7s_CPPAFLAGS = -O0 -g -gdwarf-2 -g -gen-debug 41 at91sam7s_CPPFLAGS = -O0 -D'ARCH=0' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -I app/at91sam7s/hw -Iapp/at91sam7s -Ibertos/cpu/arm41 at91sam7s_CPPFLAGS = -O0 -D'ARCH=0' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -Iexamples/at91sam7s/hw -Iexamples/at91sam7s -Ibertos/cpu/arm 42 42 at91sam7s_LDFLAGS = -nostartfiles -T bertos/cpu/arm/scripts/at91sam7_256_ram.ld -Wl,--no-warn-mismatch 43 43 trunk/examples/demo/demo.mk
r1692 r1913 29 29 30 30 demo_CSRC = \ 31 app/demo/demo.c \31 examples/demo/demo.c \ 32 32 bertos/os/hptime.c \ 33 33 bertos/gfx/bitmap.c \ … … 77 77 78 78 79 demo_CFLAGS = -I app/demo $(EMUL_CFLAGS)80 demo_CXXFLAGS = -I app/demo $(EMUL_CFLAGS)79 demo_CFLAGS = -Iexamples/demo $(EMUL_CFLAGS) 80 demo_CXXFLAGS = -Iexamples/demo $(EMUL_CFLAGS) 81 81 demo_LDFLAGS = $(EMUL_LDFLAGS) 82 82 trunk/examples/lm3s1968/lm3s1968.mk
r1787 r1913 18 18 19 19 lm3s1968_CSRC = \ 20 app/lm3s1968/lm3s1968.c \20 examples/lm3s1968/lm3s1968.c \ 21 21 #bertos/cpu/cortex-m3/startup_lm3s.c 22 22 … … 25 25 26 26 lm3s1968_CPPAFLAGS = -O0 -g -gdwarf-2 -g -gen-debug -mthumb 27 lm3s1968_CPPFLAGS = -O0 -D'ARCH=0' -D__ARM_LM3S1968__ -g3 -gdwarf-2 -fverbose-asm -mthumb -I app/lm3s1968 -Ibertos/cpu/cortex-m328 lm3s1968_LDFLAGS = -nostartfiles -T app/lm3s1968/standalone.ld -Wl,--no-warn-mismatch27 lm3s1968_CPPFLAGS = -O0 -D'ARCH=0' -D__ARM_LM3S1968__ -g3 -gdwarf-2 -fverbose-asm -mthumb -Iexamples/lm3s1968 -Ibertos/cpu/cortex-m3 28 lm3s1968_LDFLAGS = -nostartfiles -T examples/lm3s1968/standalone.ld -Wl,--no-warn-mismatch 29 29 30 30 lm3s1968_CPU = cortex-m3 trunk/examples/randpool/randpool_demo.mk
r833 r1913 22 22 23 23 randpool_demo_CSRC = \ 24 app/randpool/randpool_demo.c \24 examples/randpool/randpool_demo.c \ 25 25 algos/randpool.c \ 26 26 algos/md2.c \ … … 28 28 os/hptime.c 29 29 30 randpool_demo_CFLAGS = -O0 -D'ARCH=0' -I app/randpool/ -Iapp/randpool/hw30 randpool_demo_CFLAGS = -O0 -D'ARCH=0' -Iexamples/randpool/ -Iexamples/randpool/hw 31 31 32 32 # Debug stuff trunk/examples/test/armtest.mk
r1743 r1913 17 17 18 18 #include arm c and asm sources 19 include ./ app/test/arm_src.mk19 include ./examples/test/arm_src.mk 20 20 21 armtest_CSRC = $(arm_CSRC) app/test/empty_main.c21 armtest_CSRC = $(arm_CSRC) examples/test/empty_main.c 22 22 23 23 armtest_CPPASRC = $(arm_ASRC) … … 26 26 27 27 armtest_CPPAFLAGS = -O0 -g -gdwarf-2 -g -gen-debug 28 armtest_CPPFLAGS = -O0 -D'ARCH=ARCH_NIGHTTEST' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -I app/test -Ibertos/cpu/arm28 armtest_CPPFLAGS = -O0 -D'ARCH=ARCH_NIGHTTEST' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -Iexamples/test -Ibertos/cpu/arm 29 29 armtest_LDFLAGS = -nostartfiles -T bertos/cpu/arm/scripts/at91sam7_256_rom.ld -Wl,--no-warn-mismatch 30 30 trunk/examples/test/avrtest.mk
r1743 r1913 20 20 21 21 #include avr c and asm sources 22 include app/test/avr_src.mk22 include examples/test/avr_src.mk 23 23 24 avrtest_CSRC = $(avr_CSRC) app/test/empty_main.c24 avrtest_CSRC = $(avr_CSRC) examples/test/empty_main.c 25 25 26 26 avrtest_CPPASRC = $(avr_ASRC) … … 29 29 30 30 avrtest_CROSS = avr- 31 avrtest_CPPFLAGS = -D'ARCH=ARCH_NIGHTTEST' -I app/test -Ibertos/cpu/avr31 avrtest_CPPFLAGS = -D'ARCH=ARCH_NIGHTTEST' -Iexamples/test -Ibertos/cpu/avr 32 32 avrtest_CFLAGS = -Os -mcall-prologues -fno-strict-aliasing trunk/examples/triface/triface.mk
r1719 r1913 21 21 triface_lock = 0x2f 22 22 triface_CSRC = \ 23 app/triface/triface.c \24 app/triface/protocol.c \25 app/triface/hw/hw_adc.c \23 examples/triface/triface.c \ 24 examples/triface/protocol.c \ 25 examples/triface/hw/hw_adc.c \ 26 26 bertos/drv/timer.c \ 27 27 bertos/drv/ser.c \ … … 42 42 43 43 44 triface_CFLAGS = -O2 -D'ARCH=(ARCH_TRIFACE)' -fno-strict-aliasing -I app/triface -Ibertos/cpu/avr44 triface_CFLAGS = -O2 -D'ARCH=(ARCH_TRIFACE)' -fno-strict-aliasing -Iexamples/triface -Ibertos/cpu/avr 45 45 triface_LDFLAGS = -Wl 46 46 … … 56 56 boot_MCU = atmega64 57 57 boot_CSRC = \ 58 app/triface/boot/main.c \58 examples/triface/boot/main.c \ 59 59 bertos/net/xmodem.c \ 60 60 bertos/drv/ser.c \ … … 67 67 # 68 68 boot_CROSS = avr- 69 boot_CPPFLAGS = -D'ARCH=(ARCH_TRIFACE|ARCH_BOOT)' -I app/triface/boot -Ibertos/cpu/avr69 boot_CPPFLAGS = -D'ARCH=(ARCH_TRIFACE|ARCH_BOOT)' -Iexamples/triface/boot -Ibertos/cpu/avr 70 70 boot_CFLAGS = -Os -mcall-prologues 71 boot_LDSCRIPT = app/triface/boot/boot.ld71 boot_LDSCRIPT = examples/triface/boot/boot.ld 72 72 boot_LDFLAGS = -Wl,--relax
