Changeset cec261e in mainline for uspace/srv


Ignore:
Timestamp:
2010-01-16T21:45:58Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3e30c0b
Parents:
dc9162b (diff), ccb785b (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 improvement of remaining userspace makefiles.

Location:
uspace/srv/loader
Files:
1 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/loader/Makefile

    rdc9162b rcec261e  
    2828#
    2929
    30 include Makefile.common
     30-include ../../../Makefile.config
     31include arch/$(UARCH)/Makefile.inc
    3132
    32 .PHONY: all clean
     33USPACE_PREFIX = ../..
     34LIBS = $(LIBC_PREFIX)/libc.a
     35EXTRA_CFLAGS += -Iinclude
    3336
    34 all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
    35         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    36         $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
     37OUTPUT = loader
    3738
    38 clean:
    39         rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm arch/*/_link.ld
    40         find . -name '*.o' -follow -exec rm \{\} \;
     39GENERIC_SOURCES = \
     40        main.c \
     41        elf_load.c \
     42        interp.s
     43
     44SOURCES := $(GENERIC_SOURCES) $(ARCH_SOURCES)
     45OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
     46
     47include ../Makefile.common

  • uspace/srv/loader/arch/amd64/Makefile.inc

    rdc9162b rcec261e  
    2727#
    2828
    29 CFLAGS += -D__64_BITS__
     29EXTRA_CFLAGS = -D__64_BITS__
    3030ARCH_SOURCES := arch/$(UARCH)/amd64.s

  • uspace/srv/loader/arch/arm32/Makefile.inc

    rdc9162b rcec261e  
    2727#
    2828
    29 CFLAGS += -D__32_BITS__
     29EXTRA_CFLAGS = -D__32_BITS__
    3030ARCH_SOURCES := arch/$(UARCH)/arm32.s

  • uspace/srv/loader/arch/ia32/Makefile.inc

    rdc9162b rcec261e  
    2727#
    2828
    29 CFLAGS += -D__32_BITS__
     29EXTRA_CFLAGS = -D__32_BITS__
    3030ARCH_SOURCES := arch/$(UARCH)/ia32.s

  • uspace/srv/loader/arch/ia64/Makefile.inc

    rdc9162b rcec261e  
    2727#
    2828
    29 CFLAGS += -D__64_BITS__
     29EXTRA_CFLAGS = -D__64_BITS__
    3030ARCH_SOURCES := arch/$(UARCH)/ia64.s
    3131AFLAGS += -xexplicit

  • uspace/srv/loader/arch/mips32/Makefile.inc

    rdc9162b rcec261e  
    2727#
    2828
    29 CFLAGS += -D__32_BITS__
     29EXTRA_CFLAGS = -D__32_BITS__
    3030ARCH_SOURCES := arch/$(UARCH)/mips32.s

  • uspace/srv/loader/arch/ppc32/Makefile.inc

    rdc9162b rcec261e  
    2727#
    2828
    29 CFLAGS += -D__32_BITS__
     29EXTRA_CFLAGS = -D__32_BITS__
    3030ARCH_SOURCES := arch/$(UARCH)/ppc32.s

  • uspace/srv/loader/arch/sparc64/Makefile.inc

    rdc9162b rcec261e  
    2727#
    2828
    29 CFLAGS += -D__64_BITS__
     29EXTRA_CFLAGS = -D__64_BITS__
    3030ARCH_SOURCES := arch/$(UARCH)/sparc64.s
Note: See TracChangeset for help on using the changeset viewer.