Changeset 6ef2c11 in mainline for uspace/app


Ignore:
Timestamp:
2010-01-06T20:33:50Z (16 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
385a3d6
Parents:
4da7d79 (diff), 23efd30 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Location:
uspace/app
Files:
2 added
29 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/bdsh/Makefile

    r4da7d79 r6ef2c11  
    3434all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    36         $(MAKE) -f Makefile.build
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3737
    3838clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
    4040        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/bdsh/Makefile.build

    r4da7d79 r6ef2c11  
    7979%.o: %.c $(DEPEND)
    8080        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     81ifeq ($(PRECHECK),y)
     82        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     83endif
    8184
    8285$(DEPEND):

  • uspace/app/bdsh/Makefile.common

    r4da7d79 r6ef2c11  
    3838DEPEND = Makefile.depend
    3939DEPEND_PREV = $(DEPEND).prev
     40JOB = bdsh.job
    4041OUTPUT = bdsh

  • uspace/app/edit/Makefile

    r4da7d79 r6ef2c11  
    3434all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    36         $(MAKE) -f Makefile.build
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3737
    3838clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
    4040        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/edit/Makefile.build

    r4da7d79 r6ef2c11  
    5757%.o: %.c $(DEPEND)
    5858        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     59ifeq ($(PRECHECK),y)
     60        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     61endif
    5962
    6063$(DEPEND):

  • uspace/app/edit/Makefile.common

    r4da7d79 r6ef2c11  
    3737DEPEND = Makefile.depend
    3838DEPEND_PREV = $(DEPEND).prev
     39JOB = edit.job
    3940OUTPUT = edit

  • uspace/app/getterm/Makefile

    r4da7d79 r6ef2c11  
    3434all: $(LIBC_PREFIX)/../../../version $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    36         $(MAKE) -f Makefile.build
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3737
    3838clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
    4040        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/getterm/Makefile.build

    r4da7d79 r6ef2c11  
    6060%.o: %.c $(DEPEND)
    6161        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     62ifeq ($(PRECHECK),y)
     63        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     64endif
    6265
    6366$(DEPEND):

  • uspace/app/getterm/Makefile.common

    r4da7d79 r6ef2c11  
    3737DEPEND = Makefile.depend
    3838DEPEND_PREV = $(DEPEND).prev
     39JOB = getterm.job
    3940OUTPUT = getterm

  • uspace/app/init/Makefile

    r4da7d79 r6ef2c11  
    3434all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    36         $(MAKE) -f Makefile.build
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3737
    3838clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
    4040        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/init/Makefile.build

    r4da7d79 r6ef2c11  
    5656%.o: %.c $(DEPEND)
    5757        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     58ifeq ($(PRECHECK),y)
     59        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     60endif
    5861
    5962$(DEPEND):

  • uspace/app/init/Makefile.common

    r4da7d79 r6ef2c11  
    3737DEPEND = Makefile.depend
    3838DEPEND_PREV = $(DEPEND).prev
     39JOB = init.job
    3940OUTPUT = init

  • uspace/app/klog/Makefile

    r4da7d79 r6ef2c11  
    3434all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    36         $(MAKE) -f Makefile.build
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3737
    3838clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
    4040        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/klog/Makefile.build

    r4da7d79 r6ef2c11  
    5656%.o: %.c $(DEPEND)
    5757        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     58ifeq ($(PRECHECK),y)
     59        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     60endif
    5861
    5962$(DEPEND):

  • uspace/app/klog/Makefile.common

    r4da7d79 r6ef2c11  
    3737DEPEND = Makefile.depend
    3838DEPEND_PREV = $(DEPEND).prev
     39JOB = klog.job
    3940OUTPUT = klog

  • uspace/app/redir/Makefile

    r4da7d79 r6ef2c11  
    3434all: $(LIBC_PREFIX)/../../../version $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    36         $(MAKE) -f Makefile.build
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3737
    3838clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
    4040        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/redir/Makefile.build

    r4da7d79 r6ef2c11  
    5656%.o: %.c $(DEPEND)
    5757        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     58ifeq ($(PRECHECK),y)
     59        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     60endif
    5861
    5962$(DEPEND):

  • uspace/app/redir/Makefile.common

    r4da7d79 r6ef2c11  
    3737DEPEND = Makefile.depend
    3838DEPEND_PREV = $(DEPEND).prev
     39JOB = redir.job
    3940OUTPUT = redir

  • uspace/app/tester/Makefile

    r4da7d79 r6ef2c11  
    3434all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    36         $(MAKE) -f Makefile.build
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3737
    3838clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
    4040        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/tester/Makefile.build

    r4da7d79 r6ef2c11  
    4949        fault/fault1.c \
    5050        fault/fault2.c \
     51        fault/fault3.c \
    5152        vfs/vfs1.c \
    5253        ipc/ping_pong.c \
    … …  
    7273%.o: %.c $(DEPEND)
    7374        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     75ifeq ($(PRECHECK),y)
     76        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     77endif
    7478
    7579$(DEPEND):

  • uspace/app/tester/Makefile.common

    r4da7d79 r6ef2c11  
    3737DEPEND = Makefile.depend
    3838DEPEND_PREV = $(DEPEND).prev
     39JOB = tester.job
    3940OUTPUT = tester

  • uspace/app/tester/tester.c

    r4da7d79 r6ef2c11  
    5656#include "fault/fault1.def"
    5757#include "fault/fault2.def"
     58#include "fault/fault3.def"
    5859#include "vfs/vfs1.def"
    5960#include "ipc/ping_pong.def"

  • uspace/app/tester/tester.h

    r4da7d79 r6ef2c11  
    7373extern char *test_fault1(void);
    7474extern char *test_fault2(void);
     75extern char *test_fault3(void);
    7576extern char *test_vfs1(void);
    7677extern char *test_ping_pong(void);

  • uspace/app/tetris/Makefile

    r4da7d79 r6ef2c11  
    3434all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    36         $(MAKE) -f Makefile.build
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3737
    3838clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
    4040        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/tetris/Makefile.build

    r4da7d79 r6ef2c11  
    6060%.o: %.c $(DEPEND)
    6161        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     62ifeq ($(PRECHECK),y)
     63        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     64endif
    6265
    6366$(DEPEND):

  • uspace/app/tetris/Makefile.common

    r4da7d79 r6ef2c11  
    3737DEPEND = Makefile.depend
    3838DEPEND_PREV = $(DEPEND).prev
     39JOB = tetris.job
    3940OUTPUT = tetris

  • uspace/app/trace/Makefile

    r4da7d79 r6ef2c11  
    3434all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
    3535        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    36         $(MAKE) -f Makefile.build
     36        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
    3737
    3838clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
    4040        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/trace/Makefile.build

    r4da7d79 r6ef2c11  
    6161%.o: %.c $(DEPEND)
    6262        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     63ifeq ($(PRECHECK),y)
     64        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     65endif
    6366
    6467$(DEPEND):

  • uspace/app/trace/Makefile.common

    r4da7d79 r6ef2c11  
    3737DEPEND = Makefile.depend
    3838DEPEND_PREV = $(DEPEND).prev
     39JOB = trace.job
    3940OUTPUT = trace
Note: See TracChangeset for help on using the changeset viewer.