From f4f0b8b7a69c2822c3d266fd21806340c5160db4 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Mon, 30 Apr 2001 01:13:22 +0000 Subject: [PATCH] Remove unneeded LOST_SYM_LIBS defines. git-svn-id: svn://10.0.0.236/trunk@93441 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/xmlextras/tests/Makefile.in | 1 - mozilla/htmlparser/robot/test/Makefile.in | 9 --------- mozilla/layout/html/tests/Makefile.in | 9 --------- mozilla/netwerk/cache/filecache/test/Makefile.in | 7 +------ mozilla/netwerk/streamconv/test/Makefile.in | 5 ----- mozilla/netwerk/test/Makefile.in | 9 --------- mozilla/parser/htmlparser/robot/test/Makefile.in | 9 --------- mozilla/rdf/tests/rdfpoll/Makefile.in | 9 --------- mozilla/webshell/tests/viewer/Makefile.in | 9 --------- mozilla/xpcom/proxy/tests/Makefile.in | 4 ---- mozilla/xpcom/reflect/xptcall/tests/Makefile.in | 5 ----- mozilla/xpcom/reflect/xptinfo/tests/Makefile.in | 5 ----- mozilla/xpcom/sample/Makefile.in | 8 -------- mozilla/xpcom/tests/Makefile.in | 9 --------- mozilla/xpcom/tools/registry/Makefile.in | 1 - mozilla/xpcom/typelib/xpt/tests/Makefile.in | 5 ----- 16 files changed, 1 insertion(+), 103 deletions(-) diff --git a/mozilla/extensions/xmlextras/tests/Makefile.in b/mozilla/extensions/xmlextras/tests/Makefile.in index b990861d9bd..9b39968cb25 100644 --- a/mozilla/extensions/xmlextras/tests/Makefile.in +++ b/mozilla/extensions/xmlextras/tests/Makefile.in @@ -39,7 +39,6 @@ include $(topsrcdir)/config/config.mk LIBS = \ $(MOZ_JS_LIBS) \ $(XPCOM_LIBS) \ - $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/htmlparser/robot/test/Makefile.in b/mozilla/htmlparser/robot/test/Makefile.in index 8a5060079c8..132cfe7c5ea 100644 --- a/mozilla/htmlparser/robot/test/Makefile.in +++ b/mozilla/htmlparser/robot/test/Makefile.in @@ -39,20 +39,11 @@ endif LIBS = \ $(EXTRA_DSO_LIBS) \ - $(LOST_SYM_LIBS) \ $(MOZ_COMPONENT_LIBS) \ $(NULL) include $(topsrcdir)/config/config.mk -ifeq ($(OS_ARCH)$(OS_TEST),NetBSDarm32) -NO_LD_ARCHIVE_FLAGS := 1 -endif - -ifdef NO_LD_ARCHIVE_FLAGS -LOST_SYM_LIBS = -lxpcomds_s -lxpcomio_s -lxptinfo -lmozreg_s -endif - include $(topsrcdir)/config/rules.mk DEFINES += -DUSE_NSREG diff --git a/mozilla/layout/html/tests/Makefile.in b/mozilla/layout/html/tests/Makefile.in index b4512241c68..61dae752f1e 100644 --- a/mozilla/layout/html/tests/Makefile.in +++ b/mozilla/layout/html/tests/Makefile.in @@ -58,19 +58,10 @@ LIBS = \ $(MOZ_JS_LIBS) \ $(EXTRA_DSO_LIBS) \ $(TK_LIBS) \ - $(LOST_SYM_LIBS) \ $(MOZ_COMPONENT_LIBS) \ $(NULL) include $(topsrcdir)/config/config.mk -ifeq ($(OS_ARCH)$(OS_TEST),NetBSDarm32) -NO_LD_ARCHIVE_FLAGS := 1 -endif - -ifdef NO_LD_ARCHIVE_FLAGS -LOST_SYM_LIBS = -lxpcomds_s -lxpcomio_s -lxptinfo -lmozreg_s -endif - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/cache/filecache/test/Makefile.in b/mozilla/netwerk/cache/filecache/test/Makefile.in index 4f6f192b4fe..f3e9b7cba37 100644 --- a/mozilla/netwerk/cache/filecache/test/Makefile.in +++ b/mozilla/netwerk/cache/filecache/test/Makefile.in @@ -30,16 +30,11 @@ CPPSRCS = \ SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=) -ifdef NO_LD_ARCHIVE_FLAGS -LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s -endif - LIBS = \ $(MOZ_JS_LIBS) \ $(XPCOM_LIBS) \ - -lmozdbm_s \ + -lmozdbm_s \ $(MOZ_NECKO_UTIL_LIBS) \ - $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/netwerk/streamconv/test/Makefile.in b/mozilla/netwerk/streamconv/test/Makefile.in index 18615d55ceb..1c816f0912f 100644 --- a/mozilla/netwerk/streamconv/test/Makefile.in +++ b/mozilla/netwerk/streamconv/test/Makefile.in @@ -35,13 +35,8 @@ CPPSRCS = \ TestStreamConv.cpp \ $(NULL) -ifdef NO_LD_ARCHIVE_FLAGS -LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s -endif - LIBS = \ $(XPCOM_LIBS) \ - $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/netwerk/test/Makefile.in b/mozilla/netwerk/test/Makefile.in index db249940b7b..fb6327d4f89 100644 --- a/mozilla/netwerk/test/Makefile.in +++ b/mozilla/netwerk/test/Makefile.in @@ -57,18 +57,9 @@ SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) include $(topsrcdir)/config/config.mk -ifeq ($(OS_ARCH)$(OS_TEST),NetBSDarm32) -NO_LD_ARCHIVE_FLAGS := 1 -endif - -ifdef NO_LD_ARCHIVE_FLAGS -LOST_SYM_LIBS = -lxpcomds_s -lxpcomio_s -lxptinfo -lmozreg_s -endif - LIBS = \ $(MOZ_JS_LIBS) \ $(XPCOM_LIBS) \ - $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(SHARED_LIBRARY_LIBS) \ $(NULL) diff --git a/mozilla/parser/htmlparser/robot/test/Makefile.in b/mozilla/parser/htmlparser/robot/test/Makefile.in index 8a5060079c8..132cfe7c5ea 100644 --- a/mozilla/parser/htmlparser/robot/test/Makefile.in +++ b/mozilla/parser/htmlparser/robot/test/Makefile.in @@ -39,20 +39,11 @@ endif LIBS = \ $(EXTRA_DSO_LIBS) \ - $(LOST_SYM_LIBS) \ $(MOZ_COMPONENT_LIBS) \ $(NULL) include $(topsrcdir)/config/config.mk -ifeq ($(OS_ARCH)$(OS_TEST),NetBSDarm32) -NO_LD_ARCHIVE_FLAGS := 1 -endif - -ifdef NO_LD_ARCHIVE_FLAGS -LOST_SYM_LIBS = -lxpcomds_s -lxpcomio_s -lxptinfo -lmozreg_s -endif - include $(topsrcdir)/config/rules.mk DEFINES += -DUSE_NSREG diff --git a/mozilla/rdf/tests/rdfpoll/Makefile.in b/mozilla/rdf/tests/rdfpoll/Makefile.in index 12c2796a7c0..f23d1f8e134 100644 --- a/mozilla/rdf/tests/rdfpoll/Makefile.in +++ b/mozilla/rdf/tests/rdfpoll/Makefile.in @@ -34,19 +34,10 @@ LIBS = \ $(MOZ_JS_LIBS) \ $(XPCOM_LIBS) \ $(TK_LIBS) \ - $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) include $(topsrcdir)/config/config.mk -ifeq ($(OS_ARCH)$(OS_TEST),NetBSDarm32) -NO_LD_ARCHIVE_FLAGS := 1 -endif - -ifdef NO_LD_ARCHIVE_FLAGS -LOST_SYM_LIBS = -lxpcomds_s -lxpcomio_s -lxptinfo -lmozreg_s -endif - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in index 6ee21be638f..eb5f3bd0f89 100644 --- a/mozilla/webshell/tests/viewer/Makefile.in +++ b/mozilla/webshell/tests/viewer/Makefile.in @@ -126,7 +126,6 @@ endif XP_LIBS += \ $(XP_NS_UNDERBAR_CRAP) \ $(XP_DIST_LIBS) \ - $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) @@ -158,14 +157,6 @@ EXTRA_DEPS = \ include $(topsrcdir)/config/config.mk -ifeq ($(OS_ARCH)$(OS_TEST),NetBSDarm32) -NO_LD_ARCHIVE_FLAGS := 1 -endif - -ifdef NO_LD_ARCHIVE_FLAGS -LOST_SYM_LIBS = -lxpcomds_s -lxpcomio_s -lxptinfo -lmozreg_s -endif - # Force a build thru DIRS so that dependencies are updated properly install:: +$(LOOP_OVER_DIRS) diff --git a/mozilla/xpcom/proxy/tests/Makefile.in b/mozilla/xpcom/proxy/tests/Makefile.in index 2c8c7930a47..f8315375ad0 100644 --- a/mozilla/xpcom/proxy/tests/Makefile.in +++ b/mozilla/xpcom/proxy/tests/Makefile.in @@ -34,13 +34,9 @@ CPPSRCS = proxytests.cpp XPIDLSRCS = nsITestProxy.idl SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) -ifdef NO_LD_ARCHIVE_FLAGS -LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s -endif LIBS = \ $(XPCOM_LIBS) \ - $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpcom/reflect/xptcall/tests/Makefile.in b/mozilla/xpcom/reflect/xptcall/tests/Makefile.in index 3b5d839eb29..61d1fcc587e 100644 --- a/mozilla/xpcom/reflect/xptcall/tests/Makefile.in +++ b/mozilla/xpcom/reflect/xptcall/tests/Makefile.in @@ -32,13 +32,8 @@ REQUIRES = xpcom CPPSRCS = TestXPTCInvoke.cpp -ifdef NO_LD_ARCHIVE_FLAGS -LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s -endif - LIBS = \ $(XPCOM_LIBS) \ - $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in b/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in index a050123fd59..c843e561e15 100644 --- a/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in +++ b/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in @@ -32,13 +32,8 @@ SIMPLE_PROGRAMS = TestInterfaceInfo$(BIN_SUFFIX) CPPSRCS = TestInterfaceInfo.cpp -ifdef NO_LD_ARCHIVE_FLAGS -LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s -endif - LIBS = \ $(XPCOM_LIBS) \ - $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpcom/sample/Makefile.in b/mozilla/xpcom/sample/Makefile.in index d8b5e3f1042..6b12eb0fc7e 100644 --- a/mozilla/xpcom/sample/Makefile.in +++ b/mozilla/xpcom/sample/Makefile.in @@ -46,14 +46,6 @@ SIMPLE_PROGRAMS = $(TESTCPPSRCS:.cpp=$(BIN_SUFFIX)) include $(topsrcdir)/config/config.mk -ifeq ($(OS_ARCH)$(OS_TEST),NetBSDarm32) -NO_LD_ARCHIVE_FLAGS := 1 -endif - -ifdef NO_LD_ARCHIVE_FLAGS -LOST_SYM_LIBS = -lxpcomds_s -lxpcomio_s -lxptinfo -lmozreg_s -endif - LIBS += \ $(XPCOM_LIBS) \ $(NSPR_LIBS) \ diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in index 5c6abca9ea5..1d3321242e9 100644 --- a/mozilla/xpcom/tests/Makefile.in +++ b/mozilla/xpcom/tests/Makefile.in @@ -57,14 +57,6 @@ SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) include $(topsrcdir)/config/config.mk -ifeq ($(OS_ARCH)$(OS_TEST),NetBSDarm32) -NO_LD_ARCHIVE_FLAGS := 1 -endif - -ifdef NO_LD_ARCHIVE_FLAGS -LOST_SYM_LIBS = -lxpcomds_s -lxpcomio_s -lxptinfo -lmozreg_s -endif - # These won't link on BSD/OS, due to multiply defined symbols. ifneq ($(OS_ARCH),BSD_OS) CPPSRCS += \ @@ -77,7 +69,6 @@ LIBS += \ $(MOZ_JS_LIBS) \ $(XPCOM_LIBS) \ $(TK_LIBS) \ - $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpcom/tools/registry/Makefile.in b/mozilla/xpcom/tools/registry/Makefile.in index 8f2866fe3bf..0dfed13a56c 100644 --- a/mozilla/xpcom/tools/registry/Makefile.in +++ b/mozilla/xpcom/tools/registry/Makefile.in @@ -33,7 +33,6 @@ REQUIRES = string SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) LIBS = \ - $(LOST_SYM_LIBS) \ $(MOZ_COMPONENT_LIBS) \ $(NULL) diff --git a/mozilla/xpcom/typelib/xpt/tests/Makefile.in b/mozilla/xpcom/typelib/xpt/tests/Makefile.in index 3445f710c6a..f35f6163d07 100644 --- a/mozilla/xpcom/typelib/xpt/tests/Makefile.in +++ b/mozilla/xpcom/typelib/xpt/tests/Makefile.in @@ -33,13 +33,8 @@ SIMPLE_PROGRAMS = PrimitiveTest$(BIN_SUFFIX) SimpleTypeLib$(BIN_SUFFIX) CSRCS = PrimitiveTest.c SimpleTypeLib.c -ifdef NO_LD_ARCHIVE_FLAGS -LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s -endif - LIBS = \ $(XPCOM_LIBS) \ - $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL)