Changeset 371bd7d in mainline for boot/arch/arm32/loader/Makefile

Timestamp:

2010-03-27T09:22:17Z (15 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/arm32/loader/Makefile (modified) (2 diffs)

boot/arch/arm32/loader/Makefile

@@ -32 +32 @@
 .PHONY: all clean
 
-all: ../../../../version ../../../../Makefile.config ../../../../config.h ../../../../config.defs
+all: ../../../../version ../../../../Makefile.common ../../../../Makefile.config ../../../../config.h
         -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build
+        $(MAKE) -f Makefile.build PRECHECK=$(PRECHECK)
 
 clean:
+        rm -f $(USPACEDIR)/dist/srv/*
+        rm -f $(USPACEDIR)/dist/app/*
+        rm -f $(USPACEDIR)/dist/cfg/net/*
+
         for file in $(RD_SRVS) ; do \
                 rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
@@ -43 +47 @@
                 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \
         done
-        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs
+        for file in $(NET_CFG) ; do \
+                rm -f $(USPACEDIR)/dist/cfg/net/`basename $$file` ; \
+        done
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(COMPS).h $(COMPS).c $(LINK) $(INITRD).img $(INITRD).fs
         find . -name '*.o' -follow -exec rm \{\} \;
         find . -name '*.co' -follow -exec rm \{\} \;