Changeset 1ea99cc in mainline for boot/arch/ia32/Makefile.inc

Timestamp:

2009-08-20T20:47:35Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b50b5af2

Parents:

24edc18

Message:

Merge changes from original Subversion dynload branch.

File:

• boot/arch/ia32/Makefile.inc (modified) (3 diffs)

boot/arch/ia32/Makefile.inc

@@ -58 +58 @@
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \
+        $(USPACEDIR)/app/dltest2/dltest2 \
+        $(USPACEDIR)/app/dload/dload \
         $(USPACEDIR)/app/trace/trace \
         $(USPACEDIR)/app/klog/klog \
         $(USPACEDIR)/app/bdsh/bdsh
 
+RD_LIBS = \
+        $(USPACEDIR)/lib/libtest/libtest.so.0
+
+ifeq ($(CONFIG_BUILD_SHARED_LIBC), y)
+        RD_LIBS += $(USPACEDIR)/lib/libc/shared/libc.so.0
+        RD_APPS += $(USPACEDIR)/app/dltest/dltest
+endif
+
 build: $(BASE)/image.iso
 
-$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_APPS)
+$(BASE)/image.iso: arch/$(BARCH)/grub/stage2_eltorito arch/$(BARCH)/grub/menu.lst $(KERNELDIR)/kernel.bin $(INIT_TASKS) $(RD_SRVS) $(RD_LIBS) $(RD_APPS)
         mkdir -p $(TMP)/boot/grub
         cp arch/$(BARCH)/grub/stage2_eltorito $(TMP)/boot/grub/
@@ -79 +89 @@
         for file in $(RD_SRVS) ; do \
                 cp $$file $(USPACEDIR)/dist/srv/ ; \
+        done
+        for lib in $(RD_LIBS) ; do \
+                cp $$lib $(USPACEDIR)/dist/lib/ ; \
         done
         for file in $(RD_APPS) ; do \
@@ -97 +110 @@
                 rm -f $(USPACEDIR)/dist/srv/`basename $$file` ; \
         done
+        -for lib in $(RD_LIBS) ; do \
+                rm -f $(USPACEDIR)/dist/lib/`basename $$lib` ; \
+        done
         -for file in $(RD_APPS) ; do \
                 rm -f $(USPACEDIR)/dist/app/`basename $$file` ; \