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

File:

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

uspace/srv/loader/Makefile

@@ -28 +28 @@
 #
 
-USPACE_PREFIX = ../..
-ROOT_PATH = $(USPACE_PREFIX)/..
-
-COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
-CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
-
--include $(COMMON_MAKEFILE)
--include $(CONFIG_MAKEFILE)
+-include ../../../Makefile.config
 -include arch/$(UARCH)/Makefile.inc
 
-LINKER_SCRIPT = arch/$(UARCH)/_link.ld
-EXTRA_CLEAN = $(LINKER_SCRIPT)
+USPACE_PREFIX = ../..
+LIBS = $(LIBC_PREFIX)/libc.a
+EXTRA_CFLAGS += -Iinclude
+LINK_SCRIPT = arch/$(UARCH)/_link.ld
 
-EXTRA_CFLAGS = -Iinclude
-
-BINARY = loader
+OUTPUT = loader
+EXTRA_OUTPUT = $(LINK_SCRIPT)
 
 GENERIC_SOURCES = \
@@ -50 +44 @@
         interp.s
 
-SOURCES = \
-        $(GENERIC_SOURCES) \
-        $(ARCH_SOURCES)
+SOURCES := $(GENERIC_SOURCES) $(ARCH_SOURCES)
+OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-include $(USPACE_PREFIX)/Makefile.common
+include ../Makefile.common
 
-$(LINKER_SCRIPT): $(LINKER_SCRIPT).in
+$(LINK_SCRIPT): $(LINK_SCRIPT).in
         $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@