Changes in boot/arch/ppc32/loader/Makefile [e731b0d:1ea99cc] in mainline

File:

• boot/arch/ppc32/loader/Makefile (modified) (5 diffs)

boot/arch/ppc32/loader/Makefile

@@ -62 +62 @@
 SOURCES = \
         main.c \
+        ofwarch.c \
         _components.c \
+        ../../../genarch/ofw.c \
         ../../../generic/printf.c \
         ../../../generic/string.c \
-        ../../../genarch/balloc.c \
-        ../../../genarch/ofw.c \
-        ../../../genarch/ofw_tree.c \
-        ofwarch.c \
         asm.S \
         boot.S
@@ -75 +73 @@
         $(KERNELDIR)/kernel.bin \
         $(USPACEDIR)/srv/ns/ns \
+        $(USPACEDIR)/srv/loader/loader \
         $(USPACEDIR)/app/init/init \
-        $(USPACEDIR)/srv/loader/loader \
         $(USPACEDIR)/srv/devmap/devmap \
         $(USPACEDIR)/srv/bd/rd/rd \
@@ -100 +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/bdsh/bdsh \
-        $(USPACEDIR)/app/klog/klog
+        $(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)))
@@ -123 +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` ; \
@@ -128 +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 \