Changeset 1ea99cc in mainline for boot/arch/ppc32/loader/Makefile

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/ppc32/loader/Makefile (modified) (3 diffs)

boot/arch/ppc32/loader/Makefile

@@ -98 +98 @@
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \
+        $(USPACEDIR)/app/dload/dload \
+        $(USPACEDIR)/app/dltest/dltest \
+        $(USPACEDIR)/app/dltest2/dltest2 \
         $(USPACEDIR)/app/trace/trace \
         $(USPACEDIR)/app/klog/klog \
         $(USPACEDIR)/app/bdsh/bdsh
+
+RD_LIBS = \
+        $(USPACEDIR)/lib/libc/shared/libc.so.0 \
+        $(USPACEDIR)/lib/libtest/libtest.so.0
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
@@ -121 +128 @@
                 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` ; \
@@ -126 +136 @@
         -rm -f _components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o $(OBJECTS) initrd.img image.boot Makefile.depend
 
-_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_APPS) _link.ld.in
+_components.h _components.c _link.ld $(COMPONENT_OBJECTS) initrd.o: $(COMPONENTS) $(RD_SRVS) $(RD_LIBS) $(RD_APPS) _link.ld.in
         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 \