Changeset cec261e in mainline for uspace/lib/Makefile.common

Timestamp:

2010-01-16T21:45:58Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3e30c0b

Parents:

dc9162b (diff), ccb785b (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 improvement of remaining userspace makefiles.

File:

• uspace/lib/Makefile.common (moved) (moved from uspace/srv/loader/Makefile.build ) (2 diffs)

uspace/lib/Makefile.common

@@ -28 +28 @@
 #
 
-## Setup toolchain
+## Common rules for building apps.
 #
 
-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)
-OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
+LIBC_PREFIX = $(USPACE_PREFIX)/lib/libc
 
-.PHONY: all
+JOB = $(OUTPUT).job
 
-all: $(OUTPUT) $(OUTPUT).disasm
+OBJECTS = $(addsuffix .o,$(basename $(SOURCES)))
+
+-include $(USPACE_PREFIX)/../Makefile.config
+include $(LIBC_PREFIX)/Makefile.toolchain
+
+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) \
+    $(EXTRA_OUTPUT)
+        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
+
+clean:
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(EXTRA_OUTPUT) $(EXTRA_CLEAN)
+        find . -name '*.o' -follow -exec rm \{\} \;
+
+build: 
 
 -include $(DEPEND)
 
-$(OUTPUT).disasm: $(OUTPUT)
-        $(OBJDUMP) -d $< > $@
+$(OUTPUT): $(OBJECTS)
+        $(AR) rc $@ $(OBJECTS)
 
-$(OUTPUT): $(OBJECTS) $(LIBS) $(LINK)
-        $(LD) -T $(LINK) $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
+%.o: %.S $(DEPEND)
+        $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__
+endif
 
-$(LINK): $(LINK).in
-        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
+%.o: %.s $(DEPEND)
+        $(AS) $(AFLAGS) $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ as asm $(AFLAGS)
+endif
 
 %.o: %.c $(DEPEND)
@@ -70 +97 @@
 endif
 
-%.o: %.s $(DEPEND)
-        $(AS) $(AFLAGS) $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ as asm $(DEFS) $(CFLAGS)
-endif
-
-$(DEPEND):
+$(DEPEND): $(PRE_DEPEND)
         makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@