Changeset 925a21e in mainline for boot/Makefile

Timestamp:

2011-09-24T14:20:29Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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/Makefile (modified) (2 diffs)

boot/Makefile

@@ -61 +61 @@
                 cp "$$file" "$(DIST_PATH)/lib/" ; \
         done
+ifeq ($(CONFIG_DEVEL_FILES), y)
+        mkdir "$(DIST_PATH)/inc/c/"
+        cp -r -L "$(USPACE_PATH)/lib/c/include/." "$(DIST_PATH)/inc/c/"
+        cat "$(USPACE_PATH)/lib/c/arch/$(UARCH)/_link.ld" | sed 's/^STARTUP(.*)$$//g' > "$(DIST_PATH)/inc/_link.ld"
+endif
         for file in $(RD_APPS) ; do \
                 cp "$$file" "$(DIST_PATH)/app/" ; \
@@ -94 +99 @@
         rm -rf $(USPACE_PATH)/dist/drv/*
         rm -f $(USPACE_PATH)/dist/lib/*
+        rm -rf $(USPACE_PATH)/dist/inc/*
         rm -f $(USPACE_PATH)/dist/app/*
         rm -f $(USPACE_PATH)/dist/cfg/net/*