Changeset 162 for soft/giet_vm/apps


Ignore:
Timestamp:
Jun 20, 2012, 5:11:11 PM (12 years ago)
Author:
karaoui
Message:

Cleaning unused files
Simplifying Makefile
adding missing include

Location:
soft/giet_vm/apps
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • soft/giet_vm/apps/Makefile

    r161 r162  
    11# Compile the library and call the Makefile of each sub-directory. #
    2 
    32export # export all variable to sub-Makefile
    43CC      = mipsel-unknown-elf-gcc
    … …  
    76DU      = mipsel-unknown-elf-objdump
    87
    9 CFLAGS = -Wall -ffreestanding -mno-gpopt -mips32
    10 
    11 SOFT_PATH       = $(shell cd ..; pwd)/
    12 
    13 LIB_PATH        = $(SOFT_PATH)libs
    14 SYS_PATH        = $(SOFT_PATH)sys
    15 DUMP_PATH       = $(SOFT_PATH)  #where goes the generated *.bin
    16 MAP_PATH    = $(SOFT_PATH)xml
    17 BUILD_PATH      = $(SOFT_PATH)/build/
    18 BIN_PATH        = $(SOFT_PATH)/build/
    19 
    20 INCLUDE         = -I$(LIB_PATH) -I$(SOFT_PATH) -I$(SYS_PATH) -I$(MAP_PATH)
     8CFLAGS = -Wall -ffreestanding -mno-gpopt -mips32 -g
    219
    2210TRASH= /dev/null||true
    … …  
    2614LIB_COMPILE+= common.o
    2715
     16SOFT_PATH       = $(cd ..; shell pwd)/
     17
     18SYS_PATH    = $(SOFT_PATH)sys/
     19BOOT_PATH   = $(SOFT_PATH)boot/
     20MAP_PATH    = $(SOFT_PATH)xml/
     21LIBS_PATH   = $(SOFT_PATH)libs/
     22BUILD_PATH      = $(SOFT_PATH)build/
     23ELF_PATH        = $(SOFT_PATH)build/
     24
     25INCLUDE         = -I$(LIBS_PATH) -I$(SOFT_PATH) -I$(SYS_PATH) -I$(MAP_PATH)
     26
    2827DIRS=$(shell ls -d */ ) #list all directorys
    29 
    3028
    3129.PHONY: prepare
    3230
    33 all: prepare $(LIB_COMPILE)
     31all: test prepare $(LIB_COMPILE)
    3432        set -e; for d in $(DIRS); do $(MAKE)  -C $$d ; echo "Compiling $$d";  done
    3533
    3634prepare:
    3735        @mkdir $(BUILD_PATH) 2>$(TRASH)
     36        @mkdir $(ELF_PATH) 2>$(TRASH)
    3837
    39 %.o : $(LIB_PATH)/%.c
     38%.o : $(LIBS_PATH)/%.c
    4039        $(CC) $(CFLAGS) $(INCLUDE) -c -o $(BUILD_PATH)/$@ $<
    4140
    … …  
    4342        rm -f *.o
    4443        set -e; for d in $(DIRS); do $(MAKE) clean -C $$d ; done
    45 

  • soft/giet_vm/apps/fifo/Makefile

    r161 r162  
    11APP_NAME=fifo
     2
     3OBJS= main.o
    24
    35USE+= stdio.o
    46USE+= mwmr.o
    57
    6 USES=$(patsubst %,$(BUILD_PATH)%,$(USE))
    7 
    8 OBJS= main.o
     8USES=$(patsubst %,$(BUILD_PATH)/$(LIB_NAME)/%,$(USE))
    99
    1010all: $(APP_NAME).elf
    1111
    12 BIN_NAME_PATH=$(BIN_PATH)$(APP_NAME).elf
     12BIN_NAME_PATH=$(ELF_PATH)$(APP_NAME).elf
    1313
    1414$(APP_NAME).elf: $(OBJS) $(APP_NAME).ld
    … …  
    2020        $(DU) -D  $@ >  $@.txt
    2121
    22 
    2322clean:
    2423        rm -f *.o *.elf *.txt core *~ 2>$(TRASH)

  • soft/giet_vm/apps/hello/Makefile

    r161 r162  
    33USE+= stdio.o
    44
    5 USES=$(patsubst %,$(BUILD_PATH)%,$(USE))
     5USES=$(patsubst %,$(BUILD_PATH)/$(LIB_NAME)/%,$(USE))
    66
    77OBJS= main.o
    … …  
    99all: $(APP_NAME).elf
    1010
    11 BIN_NAME_PATH=$(BIN_PATH)$(APP_NAME).elf
     11BIN_NAME_PATH=$(ELF_PATH)$(APP_NAME).elf
    1212
    1313$(APP_NAME).elf: $(OBJS) $(APP_NAME).ld

  • soft/giet_vm/apps/numsplit/Makefile

    r161 r162  
    88OBJS+= producer.o
    99
    10 USES=$(patsubst %,$(BUILD_PATH)%,$(USE))
     10USES=$(patsubst %,$(BUILD_PATH)/$(LIB_NAME)/%,$(USE))
    1111SRCS=$(patsubst %.o,%.c,$(OBJS))
    1212
    … …  
    1515.PHONY: compile
    1616
    17 BIN_NAME_PATH=$(BIN_PATH)$(APP_NAME).elf
     17BIN_NAME_PATH=$(ELF_PATH)$(APP_NAME).elf
    1818
    1919$(APP_NAME).elf: compile $(APP_NAME).ld

  • soft/giet_vm/apps/numsplit/consumer.c

    r160 r162  
    66    srl_mwmr_t input = GET_MWMR(mwmr);
    77    char buf[BUF_SIZE];
    8     int i,x;
     8    //int i,x;
    99    while(1)
    1010    {

  • soft/giet_vm/apps/pgcd/Makefile

    r161 r162  
    33USE+= stdio.o
    44
    5 USES=$(patsubst %,$(BUILD_PATH)%,$(USE))
     5USES=$(patsubst %,$(BUILD_PATH)/$(LIB_NAME)/%,$(USE))
    66
    77OBJS= main.o
    … …  
    99all: $(APP_NAME).elf
    1010
    11 BIN_NAME_PATH=$(BIN_PATH)$(APP_NAME).elf
     11BIN_NAME_PATH=$(ELF_PATH)$(APP_NAME).elf
    1212
    1313$(APP_NAME).elf: $(OBJS) $(APP_NAME).ld

  • soft/giet_vm/apps/router/Makefile

    r161 r162  
    44USE+= mwmr.o
    55
    6 USES= $(patsubst %,$(BUILD_PATH)%,$(USE))
     6USES=$(patsubst %,$(BUILD_PATH)/$(LIB_NAME)/%,$(USE))
    77
    88OBJS= main.o
    … …  
    1010all: $(APP_NAME).elf
    1111
    12 BIN_NAME_PATH=$(BIN_PATH)$(APP_NAME).elf
     12BIN_NAME_PATH=$(ELF_PATH)$(APP_NAME).elf
    1313
    1414$(APP_NAME).elf: $(OBJS) $(APP_NAME).ld
Note: See TracChangeset for help on using the changeset viewer.