Changeset 48e1467 in mainline for uspace/srv/loader/Makefile

Timestamp:

2010-01-22T16:52:17Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0cb2d72

Parents:

92bee46 (diff), 9d3133d (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.

File:

• uspace/srv/loader/Makefile (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
+LINK_SCRIPT = arch/$(UARCH)/_link.ld
 
-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
+EXTRA_OUTPUT = $(LINK_SCRIPT)
 
-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
+
+$(LINK_SCRIPT): $(LINK_SCRIPT).in
+        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@