Changeset 1913

Show
Ignore:
Timestamp:
11/07/08 23:21:30 (2 months ago)
Author:
batt
Message:

Rename app dir to examples.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/Makefile

    r1803 r1913  
    1515 
    1616#Include subtargets 
    17 include app/demo/demo.mk 
    18 #include app/at91sam7s/at91sam7s.mk 
    19 #include app/triface/triface.mk 
     17include examples/demo/demo.mk 
     18#include examples/at91sam7s/at91sam7s.mk 
     19#include examples/triface/triface.mk 
    2020 
    2121include bertos/rules.mk 
  • trunk/Makefile.test

    r1754 r1913  
    66 
    77include bertos/config.mk 
    8 include ./app/test/avrtest.mk 
    9 include ./app/test/armtest.mk 
     8include ./examples/test/avrtest.mk 
     9include ./examples/test/armtest.mk 
    1010include bertos/rules.mk 
  • trunk/examples/at91sam7s/at91sam7s.mk

    r1716 r1913  
    1717 
    1818at91sam7s_CSRC = \ 
    19         app/at91sam7s/at91sam7s.c \ 
     19        examples/at91sam7s/at91sam7s.c \ 
    2020        bertos/drv/timer.c \ 
    2121        bertos/drv/ser.c \ 
     
    3939 
    4040at91sam7s_CPPAFLAGS = -O0 -g -gdwarf-2 -g -gen-debug 
    41 at91sam7s_CPPFLAGS = -O0 -D'ARCH=0' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -Iapp/at91sam7s/hw -Iapp/at91sam7s -Ibertos/cpu/arm 
     41at91sam7s_CPPFLAGS = -O0 -D'ARCH=0' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -Iexamples/at91sam7s/hw -Iexamples/at91sam7s -Ibertos/cpu/arm 
    4242at91sam7s_LDFLAGS = -nostartfiles -T bertos/cpu/arm/scripts/at91sam7_256_ram.ld -Wl,--no-warn-mismatch 
    4343 
  • trunk/examples/demo/demo.mk

    r1692 r1913  
    2929 
    3030demo_CSRC = \ 
    31         app/demo/demo.c \ 
     31        examples/demo/demo.c \ 
    3232        bertos/os/hptime.c \ 
    3333        bertos/gfx/bitmap.c \ 
     
    7777 
    7878 
    79 demo_CFLAGS = -Iapp/demo $(EMUL_CFLAGS) 
    80 demo_CXXFLAGS = -Iapp/demo $(EMUL_CFLAGS) 
     79demo_CFLAGS = -Iexamples/demo $(EMUL_CFLAGS) 
     80demo_CXXFLAGS = -Iexamples/demo $(EMUL_CFLAGS) 
    8181demo_LDFLAGS = $(EMUL_LDFLAGS) 
    8282 
  • trunk/examples/lm3s1968/lm3s1968.mk

    r1787 r1913  
    1818 
    1919lm3s1968_CSRC = \ 
    20         app/lm3s1968/lm3s1968.c \ 
     20        examples/lm3s1968/lm3s1968.c \ 
    2121        #bertos/cpu/cortex-m3/startup_lm3s.c 
    2222 
     
    2525 
    2626lm3s1968_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  -Iapp/lm3s1968 -Ibertos/cpu/cortex-m3 
    28 lm3s1968_LDFLAGS = -nostartfiles -T app/lm3s1968/standalone.ld -Wl,--no-warn-mismatch 
     27lm3s1968_CPPFLAGS = -O0 -D'ARCH=0' -D__ARM_LM3S1968__ -g3 -gdwarf-2 -fverbose-asm -mthumb  -Iexamples/lm3s1968 -Ibertos/cpu/cortex-m3 
     28lm3s1968_LDFLAGS = -nostartfiles -T examples/lm3s1968/standalone.ld -Wl,--no-warn-mismatch 
    2929 
    3030lm3s1968_CPU = cortex-m3 
  • trunk/examples/randpool/randpool_demo.mk

    r833 r1913  
    2222 
    2323randpool_demo_CSRC = \ 
    24         app/randpool/randpool_demo.c \ 
     24        examples/randpool/randpool_demo.c \ 
    2525        algos/randpool.c \ 
    2626        algos/md2.c \ 
     
    2828        os/hptime.c  
    2929 
    30 randpool_demo_CFLAGS = -O0 -D'ARCH=0' -Iapp/randpool/ -Iapp/randpool/hw 
     30randpool_demo_CFLAGS = -O0 -D'ARCH=0' -Iexamples/randpool/ -Iexamples/randpool/hw 
    3131 
    3232# Debug stuff 
  • trunk/examples/test/armtest.mk

    r1743 r1913  
    1717 
    1818#include arm c and asm sources 
    19 include ./app/test/arm_src.mk 
     19include ./examples/test/arm_src.mk 
    2020 
    21 armtest_CSRC = $(arm_CSRC) app/test/empty_main.c 
     21armtest_CSRC = $(arm_CSRC) examples/test/empty_main.c 
    2222 
    2323armtest_CPPASRC = $(arm_ASRC) 
     
    2626 
    2727armtest_CPPAFLAGS = -O0 -g -gdwarf-2 -g -gen-debug 
    28 armtest_CPPFLAGS = -O0 -D'ARCH=ARCH_NIGHTTEST' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -Iapp/test -Ibertos/cpu/arm 
     28armtest_CPPFLAGS = -O0 -D'ARCH=ARCH_NIGHTTEST' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -Iexamples/test -Ibertos/cpu/arm 
    2929armtest_LDFLAGS = -nostartfiles -T bertos/cpu/arm/scripts/at91sam7_256_rom.ld -Wl,--no-warn-mismatch 
    3030 
  • trunk/examples/test/avrtest.mk

    r1743 r1913  
    2020 
    2121#include avr c and asm sources 
    22 include app/test/avr_src.mk 
     22include examples/test/avr_src.mk 
    2323 
    24 avrtest_CSRC = $(avr_CSRC) app/test/empty_main.c 
     24avrtest_CSRC = $(avr_CSRC) examples/test/empty_main.c 
    2525 
    2626avrtest_CPPASRC = $(avr_ASRC) 
     
    2929 
    3030avrtest_CROSS = avr- 
    31 avrtest_CPPFLAGS = -D'ARCH=ARCH_NIGHTTEST' -Iapp/test -Ibertos/cpu/avr  
     31avrtest_CPPFLAGS = -D'ARCH=ARCH_NIGHTTEST' -Iexamples/test -Ibertos/cpu/avr  
    3232avrtest_CFLAGS = -Os -mcall-prologues -fno-strict-aliasing 
  • trunk/examples/triface/triface.mk

    r1719 r1913  
    2121triface_lock = 0x2f 
    2222triface_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 \ 
    2626        bertos/drv/timer.c \ 
    2727        bertos/drv/ser.c \ 
     
    4242 
    4343 
    44 triface_CFLAGS = -O2 -D'ARCH=(ARCH_TRIFACE)' -fno-strict-aliasing -Iapp/triface -Ibertos/cpu/avr 
     44triface_CFLAGS = -O2 -D'ARCH=(ARCH_TRIFACE)' -fno-strict-aliasing -Iexamples/triface -Ibertos/cpu/avr 
    4545triface_LDFLAGS = -Wl 
    4646 
     
    5656boot_MCU = atmega64 
    5757boot_CSRC = \ 
    58         app/triface/boot/main.c \ 
     58        examples/triface/boot/main.c \ 
    5959        bertos/net/xmodem.c \ 
    6060        bertos/drv/ser.c \ 
     
    6767        # 
    6868boot_CROSS = avr- 
    69 boot_CPPFLAGS = -D'ARCH=(ARCH_TRIFACE|ARCH_BOOT)' -Iapp/triface/boot -Ibertos/cpu/avr 
     69boot_CPPFLAGS = -D'ARCH=(ARCH_TRIFACE|ARCH_BOOT)' -Iexamples/triface/boot -Ibertos/cpu/avr 
    7070boot_CFLAGS = -Os -mcall-prologues 
    71 boot_LDSCRIPT = app/triface/boot/boot.ld 
     71boot_LDSCRIPT = examples/triface/boot/boot.ld 
    7272boot_LDFLAGS = -Wl,--relax