Changes in boot/arch/ppc32/loader/Makefile.build [cc1f8d4:4e9aaf5] in mainline

File:

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

boot/arch/ppc32/loader/Makefile.build

@@ -32 +32 @@
 
 include ../../../../version
+include ../../../../Makefile.common
 include ../../../../Makefile.config
-include ../../../../config.defs
 include Makefile.common
 include Makefile.toolchain
@@ -52 +52 @@
         boot.S
 
-COMPONENTS = \
-        $(KERNELDIR)/kernel.bin \
-        $(USPACEDIR)/srv/ns/ns \
-        $(USPACEDIR)/app/init/init \
-        $(USPACEDIR)/srv/loader/loader \
-        $(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)))
 COMPONENT_OBJECTS := $(addsuffix .co,$(basename $(notdir $(COMPONENTS)))) $(INITRD).co
@@ -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)