Changes in uspace/srv/loader/Makefile [1b1164e8:fcd7053] in mainline

File:

• uspace/srv/loader/Makefile (modified) (3 diffs)

uspace/srv/loader/Makefile

@@ -1 +1 @@
 #
 # Copyright (c) 2005 Martin Decky
-# Copyright (c) 2007 Jakub Jermar
+# Copyright (c) 2008 Jiri Svoboda
 # All rights reserved.
 #
@@ -28 +28 @@
 #
 
-USPACE_PREFIX = ../..
-ROOT_PATH = $(USPACE_PREFIX)/..
+## Setup toolchain
+#
 
-COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
-CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
+LIBC_PREFIX = ../../lib/libc
+SOFTINT_PREFIX = ../../lib/softint
 
--include $(COMMON_MAKEFILE)
--include $(CONFIG_MAKEFILE)
--include arch/$(UARCH)/Makefile.inc
+include $(LIBC_PREFIX)/Makefile.toolchain
+include arch/$(UARCH)/Makefile.inc
 
-LINKER_SCRIPT = arch/$(UARCH)/_link.ld
-EXTRA_CLEAN = $(LINKER_SCRIPT)
+CFLAGS += -Iinclude
 
-EXTRA_CFLAGS = -Iinclude
+LIBS = $(LIBC_PREFIX)/libc.a $(SOFTINT_PREFIX)/libsoftint.a
 
-BINARY = loader
+## Sources
+#
 
+OUTPUT = loader
 GENERIC_SOURCES = \
         main.c \
@@ -50 +50 @@
         interp.s
 
-SOURCES = \
-        $(GENERIC_SOURCES) \
-        $(ARCH_SOURCES)
+SOURCES := $(GENERIC_SOURCES) $(ARCH_SOURCES)
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-include $(USPACE_PREFIX)/Makefile.common
+.PHONY: all clean depend disasm
 
-$(LINKER_SCRIPT): $(LINKER_SCRIPT).in
-        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
+all: $(OUTPUT) disasm
+
+-include Makefile.depend
+
+clean:
+        -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm arch/$(UARCH)/_link.ld Makefile.depend
+
+depend:
+        $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
+
+$(OUTPUT): $(OBJECTS) $(LIBS) arch/$(UARCH)/_link.ld
+        $(LD) -T arch/$(UARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
+
+disasm:
+        $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
+
+arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
+        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
+
+%.o: %.S
+        $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+
+%.o: %.s
+        $(AS) $(AFLAGS) $< -o $@
+
+%.o: %.c
+        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@