Changeset 48e1467 in mainline for uspace/srv/Makefile.common

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/Makefile.common (moved) (moved from uspace/srv/loader/Makefile.build ) (3 diffs)

uspace/srv/Makefile.common

@@ -28 +28 @@
 #
 
-## Setup toolchain
+## Common rules for building servers.
 #
 
-include Makefile.common
-include $(LIBC_PREFIX)/Makefile.toolchain
-include arch/$(UARCH)/Makefile.inc
-
-CFLAGS += -Iinclude
-LINK = arch/$(UARCH)/_link.ld
-
-## Sources
+# Individual makefiles set:
+#
+#       USPACE_PREFIX   relative path to uspace/ directory
+#       LIBS            libraries to link with (with relative path)
+#       EXTRA_CFLAGS    additional flags to pass to C compiler
+#       JOB             job file name (like appname.job)
+#       OUTPUT          output binary name (like appname)
+#       SOURCES         list of source files
 #
 
-GENERIC_SOURCES = \
-        main.c \
-        elf_load.c \
-        interp.s
+DEPEND = Makefile.depend
+DEPEND_PREV = $(DEPEND).prev
 
-SOURCES := $(GENERIC_SOURCES) $(ARCH_SOURCES)
+LIBC_PREFIX = $(USPACE_PREFIX)/lib/libc
+LIBBLOCK_PREFIX = $(USPACE_PREFIX)/lib/libblock
+LIBFS_PREFIX = $(USPACE_PREFIX)/lib/libfs
+LIBPCI_PREFIX = $(USPACE_PREFIX)/lib/libpci
+SOFTINT_PREFIX = $(USPACE_PREFIX)/lib/softint
+
+LINK_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+
+JOB = $(OUTPUT).job
+
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 
-.PHONY: all
+include $(LIBC_PREFIX)/Makefile.toolchain
 
-all: $(OUTPUT) $(OUTPUT).disasm
+CFLAGS += $(EXTRA_CFLAGS)
+
+.PHONY: all build clean
+
+all: \
+    $(LIBC_PREFIX)/../../../version \
+    $(LIBC_PREFIX)/../../../Makefile.config \
+    $(LIBC_PREFIX)/../../../config.h \
+    $(LIBC_PREFIX)/../../../config.defs \
+    $(LIBS) \
+    \
+    $(OUTPUT) $(OUTPUT).disasm \
+    $(EXTRA_OUTPUT)
+        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
+
+clean:
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(EXTRA_OUTPUT)
+        find . -name '*.o' -follow -exec rm \{\} \;
+
+build: 
 
 -include $(DEPEND)
@@ -58 +84 @@
         $(OBJDUMP) -d $< > $@
 
-$(OUTPUT): $(OBJECTS) $(LIBS) $(LINK)
-        $(LD) -T $(LINK) $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
-
-$(LINK): $(LINK).in
-        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
+$(OUTPUT): $(LINK_SCRIPT) $(OBJECTS) $(LIBS)
+        $(LD) -T $(LINK_SCRIPT) $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
 
 %.o: %.c $(DEPEND)
@@ -70 +93 @@
 endif
 
-%.o: %.s $(DEPEND)
-        $(AS) $(AFLAGS) $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ as asm $(DEFS) $(CFLAGS)
-endif
-
 $(DEPEND):
         makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null