Changeset fcd7053 in mainline for uspace/app


Ignore:
Timestamp:
2009-02-12T20:11:25Z (17 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fa024ce
Parents:
84266669
Message:

cleanup configuration
code cleanup

Location:
uspace/app
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/bdsh/Makefile

    r84266669 rfcd7053  
    3131
    3232include ../../../version
    33 -include ../../../Makefile.config
    3433
    3534LIBC_PREFIX = ../../lib/libc
    3635SOFTINT_PREFIX = ../../lib/softint
     36
    3737include $(LIBC_PREFIX)/Makefile.toolchain
    3838
    … …  
    4040
    4141LIBS = $(LIBC_PREFIX)/libc.a
    42 DEFS += -DRELEASE=\"$(RELEASE)\"
    43 
    44 ifdef REVISION
    45         DEFS += "-DREVISION=\"$(TIMESTAMP)\""
    46 endif
    47 
    48 ifdef TIMESTAMP
    49         DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
    50 endif
     42DEFS += -DRELEASE=$(RELEASE)
    5143
    5244PROGRAM = bdsh
    … …  
    113105
    114106$(PROGRAM): $(OBJECTS) $(LIBS)
    115         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(PROGRAM).map
     107        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(PROGRAM).map
    116108
    117109# Everything else is a phony target

  • uspace/app/init/Makefile

    r84266669 rfcd7053  
    2828
    2929include ../../../version
    30 -include ../../../Makefile.config
    3130
    3231## Setup toolchain
    … …  
    3534LIBC_PREFIX = ../../lib/libc
    3635SOFTINT_PREFIX = ../../lib/softint
     36
    3737include $(LIBC_PREFIX)/Makefile.toolchain
    3838
    … …  
    4040
    4141LIBS = $(LIBC_PREFIX)/libc.a
    42 DEFS += -DRELEASE=\"$(RELEASE)\"
    43 
    44 ifdef REVISION
    45         DEFS += "-DREVISION=\"$(REVISION)\""
    46 endif
    47 
    48 ifdef TIMESTAMP
    49         DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
    50 endif
     42DEFS += -DRELEASE=$(RELEASE)
    5143
    5244## Sources
    … …  
    7365
    7466$(OUTPUT): $(OBJECTS) $(LIBS)
    75         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     67        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    7668
    7769disasm: $(OUTPUT).disasm

  • uspace/app/init/version.c

    r84266669 rfcd7053  
    3636#include <unistd.h>
    3737#include <stdio.h>
     38#include <macros.h>
    3839#include "init.h"
    3940#include "version.h"
    4041
    41 char *release = RELEASE;
     42char *release = STRING(RELEASE);
    4243
    4344#ifdef REVISION
    44         char *revision = ", revision " REVISION;
     45        char *revision = ", revision " STRING(REVISION);
    4546#else
    4647        char *revision = "";
    … …  
    4849
    4950#ifdef TIMESTAMP
    50         char *timestamp = "\nBuilt on " TIMESTAMP;
     51        char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
    5152#else
    5253        char *timestamp = "";

  • uspace/app/klog/Makefile

    r84266669 rfcd7053  
    3030#
    3131
    32 -include ../../../Makefile.config
    33 
    3432LIBC_PREFIX = ../../lib/libc
    3533SOFTINT_PREFIX = ../../lib/softint
     34
    3635include $(LIBC_PREFIX)/Makefile.toolchain
    3736
    … …  
    6160
    6261$(OUTPUT): $(OBJECTS) $(LIBS)
    63         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     62        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6463
    6564disasm: $(OUTPUT).disasm

  • uspace/app/tester/Makefile

    r84266669 rfcd7053  
    3030#
    3131
    32 -include ../../../Makefile.config
    33 
    3432LIBC_PREFIX = ../../lib/libc
    3533SOFTINT_PREFIX = ../../lib/softint
     34
    3635include $(LIBC_PREFIX)/Makefile.toolchain
    3736
    … …  
    7776
    7877$(OUTPUT): $(OBJECTS) $(LIBS)
    79         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     78        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    8079
    8180disasm: $(OUTPUT).disasm

  • uspace/app/tetris/Makefile

    r84266669 rfcd7053  
    1 -include ../../../Makefile.config
    2 
    31LIBC_PREFIX = ../../lib/libc
    42SOFTINT_PREFIX = ../../lib/softint
     3
    54include $(LIBC_PREFIX)/Makefile.toolchain
    65
    … …  
    2120
    2221$(OUTPUT): $(OBJECTS) $(LIBS)
    23         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     22        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    2423
    2524clean:

  • uspace/app/trace/Makefile

    r84266669 rfcd7053  
    3030#
    3131
    32 -include ../../../Makefile.config
    33 
    3432LIBC_PREFIX = ../../lib/libc
    3533SOFTINT_PREFIX = ../../lib/softint
     34
    3635include $(LIBC_PREFIX)/Makefile.toolchain
    3736
    … …  
    6665
    6766$(OUTPUT): $(OBJECTS) $(LIBS)
    68         $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     67        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    6968
    7069disasm:
Note: See TracChangeset for help on using the changeset viewer.