Changeset ccb785b in mainline

Timestamp:

2010-01-16T21:43:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial

Children:

8416d46, cec261e

Parents:

94790d01

Message:

Use common make rules with loader.

Location:

uspace/srv/loader

Files:

• Makefile (modified) (1 diff)
• Makefile.build (deleted)
• Makefile.common (deleted)
• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/arm32/Makefile.inc (modified) (1 diff)
• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/ia64/Makefile.inc (modified) (1 diff)
• arch/mips32/Makefile.inc (modified) (1 diff)
• arch/ppc32/Makefile.inc (modified) (1 diff)
• arch/sparc64/Makefile.inc (modified) (1 diff)

uspace/srv/loader/Makefile

@@ -28 +28 @@
 #
 
-include Makefile.common
+-include ../../../Makefile.config
+include arch/$(UARCH)/Makefile.inc
 
-.PHONY: all clean
+USPACE_PREFIX = ../..
+LIBS = $(LIBC_PREFIX)/libc.a
+EXTRA_CFLAGS += -Iinclude
 
-all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
-        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
+OUTPUT = loader
 
-clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm arch/*/_link.ld
-        find . -name '*.o' -follow -exec rm \{\} \;
+GENERIC_SOURCES = \
+        main.c \
+        elf_load.c \
+        interp.s
+
+SOURCES := $(GENERIC_SOURCES) $(ARCH_SOURCES)
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+
+include ../Makefile.common

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

@@ -27 +27 @@
 #
 
-CFLAGS += -D__64_BITS__
+EXTRA_CFLAGS = -D__64_BITS__
 ARCH_SOURCES := arch/$(UARCH)/amd64.s

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

@@ -27 +27 @@
 #
 
-CFLAGS += -D__32_BITS__
+EXTRA_CFLAGS = -D__32_BITS__
 ARCH_SOURCES := arch/$(UARCH)/arm32.s

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

@@ -27 +27 @@
 #
 
-CFLAGS += -D__32_BITS__
+EXTRA_CFLAGS = -D__32_BITS__
 ARCH_SOURCES := arch/$(UARCH)/ia32.s

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

@@ -27 +27 @@
 #
 
-CFLAGS += -D__64_BITS__
+EXTRA_CFLAGS = -D__64_BITS__
 ARCH_SOURCES := arch/$(UARCH)/ia64.s
 AFLAGS += -xexplicit

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

@@ -27 +27 @@
 #
 
-CFLAGS += -D__32_BITS__
+EXTRA_CFLAGS = -D__32_BITS__
 ARCH_SOURCES := arch/$(UARCH)/mips32.s

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

@@ -27 +27 @@
 #
 
-CFLAGS += -D__32_BITS__
+EXTRA_CFLAGS = -D__32_BITS__
 ARCH_SOURCES := arch/$(UARCH)/ppc32.s

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

@@ -27 +27 @@
 #
 
-CFLAGS += -D__64_BITS__
+EXTRA_CFLAGS = -D__64_BITS__
 ARCH_SOURCES := arch/$(UARCH)/sparc64.s