Bad load fix

shell/src/Makefile

@@ -29,7 +29,12 @@ DEFINES = -D_IMPL_NS_SHELL
 
 EXTRA_DSO_LDOPTS+= -L$(DIST)/lib \
 		$(DIST)/bin/libxpcom.so \
-		$(DIST)/bin/libreg.so  $(LIBNSPR)
+		$(DIST)/bin/libnspr21.so \
+		$(DIST)/bin/libplc21.so \
+		$(DIST)/bin/libplds21.so \
+		$(DIST)/bin/libnspr21.so \
+		$(DIST)/bin/libreg.so \
+		$(NULL) \
 
 ifeq ($(OS_ARCH),linux)
 EXTRA_DSO_LDOPTS+= /usr/lib/libc.a /usr/lib/libstdc++.a 

shell/tests/apptest/Makefile

@@ -29,17 +29,19 @@ DIRS	=
 
 OBJS	= $(CPPSRCS:.cpp=.o)
 
-EX_LIBS = $(DIST)/lib/libshell_s.a \
-	$(DIST)/bin/libxpcom.so	\
-	$(DIST)/bin/libreg.so	\
+EX_LIBS = \
+	$(DIST)/lib/libshell_s.a \
+	$(DIST)/bin/libshell.so \
 	$(DIST)/bin/libgfxunix.so	\
+	$(DIST)/bin/libwidgetunix.so	\
 	$(DIST)/bin/libraptorbase.so	\
 	$(DIST)/bin/libraptorgfx.so	\
-	$(DIST)/bin/libimg.so	\
-	$(DIST)/lib/libplc21.a	\
-	$(DIST)/lib/libplds21.a	\
-	$(DIST)/lib/libnspr21.a	\
-	$(DIST)/bin/libshell.so \
+	$(DIST)/bin/libxpcom.so	\
+	$(DIST)/bin/libreg.so	\
+	$(DIST)/bin/libnspr21.so	\
+	$(DIST)/bin/libplc21.so	\
+	$(DIST)/bin/libplds21.so	\
+	$(DIST)/bin/libnspr21.so	\
 	$(NULL)