Changeset 371bd7d in mainline for boot/arch/mips32/loader/Makefile.build

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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:

• boot/arch/mips32/loader/Makefile.build (modified) (4 diffs)

boot/arch/mips32/loader/Makefile.build

@@ -32 +32 @@
 
 include ../../../../version
+include ../../../../Makefile.common
 include ../../../../Makefile.config
-include ../../../../config.defs
 include Makefile.common
 include Makefile.toolchain
@@ -48 +48 @@
         asm.S \
         boot.S
-
-COMPONENTS = \
-        $(KERNELDIR)/kernel.bin \
-        $(USPACEDIR)/srv/ns/ns \
-        $(USPACEDIR)/srv/loader/loader \
-        $(USPACEDIR)/app/init/init \
-        $(USPACEDIR)/srv/devmap/devmap \
-        $(USPACEDIR)/srv/bd/rd/rd \
-        $(USPACEDIR)/srv/vfs/vfs
-ifeq ($(RDFMT),tmpfs)
-        COMPONENTS += $(USPACEDIR)/srv/fs/tmpfs/tmpfs
-endif
-ifeq ($(RDFMT),fat)
-        COMPONENTS += $(USPACEDIR)/srv/fs/fat/fat
-endif
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
@@ -81 +66 @@
 %.o: %.S $(DEPEND)
         $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
+endif
 
 %.o: %.c $(DEPEND)
         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
+endif
 
 $(DEPEND):
+        rm -f $(USPACEDIR)/dist/srv/*
+        rm -f $(USPACEDIR)/dist/app/*
+        rm -f $(USPACEDIR)/dist/cfg/net/*
+
         for file in $(RD_SRVS) ; do \
                 cp $$file $(USPACEDIR)/dist/srv/ ; \
@@ -91 +86 @@
         for file in $(RD_APPS) ; do \
                 cp $$file $(USPACEDIR)/dist/app/ ; \
+        done
+        for file in $(NET_CFG) ; do \
+                cp $$file $(USPACEDIR)/dist/cfg/net/ ; \
         done
 ifeq ($(RDFMT),tmpfs)