cleanup linking of libmozreg.

git-svn-id: svn://10.0.0.236/trunk@44002 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ramiro%netscape.com 1999-08-21 15:41:53 +00:00
parent 60619e474f
commit 1784612f6b
57 changed files with 17 additions and 64 deletions

View File

@ -47,6 +47,5 @@ include $(topsrcdir)/config/rules.mk
LIBS += \
$(NSPR_LIBS) \
-lxpcom \
-lmozreg \
$(NULL)

View File

@ -29,12 +29,9 @@ REQUIRES = js cookie pref xpcom include
LIBS = \
-lxpcom \
-lmozreg \
$(NSPR_LIBS) \
$(NULL)
include $(topsrcdir)/config/config.mk
# hack until necko lands
ifndef NECKO
PUBLIC = $(DEPTH)/netwerk/dist/include

View File

@ -57,7 +57,6 @@ endif
LIBS = \
-lraptorgfx \
-lxpcom \
-lmozreg \
-lmozjs \
-limg \
$(JPEG_LIBS) \

View File

@ -52,7 +52,6 @@ LIBS = \
-limg \
-lmozutil \
-lxpcom \
-lmozreg \
$(TIMER_LIBS) \
$(TK_LIBS) \
$(NULL)

View File

@ -30,7 +30,6 @@ CPPSRCS = RobotMain.cpp
LIBS = \
-lDebugRobot \
-lmozreg \
-lxpcom \
$(NSPR_LIBS) \
$(NULL)

View File

@ -29,7 +29,6 @@ CPPSRCS = logparse.cpp
LIBS = \
-lraptorhtmlpars \
-lxpcom \
-lmozreg \
$(NSPR_LIBS) \
$(NULL)

View File

@ -34,7 +34,7 @@ INCLUDES += \
-I$(srcdir)/../ucvja \
$(NULL)
LIBS += $(NSPR_LIBS) -L$(DIST)/bin -lxpcom -lmozreg -luconv
LIBS += $(NSPR_LIBS) -L$(DIST)/bin -lxpcom -luconv
# needed for mac linux
ifeq ($(OS_ARCH),Linux)

View File

@ -32,7 +32,6 @@ LIBS = \
-L$(DIST)/lib \
-lmozjs \
-lxpcom \
-lmozreg \
-lmozutil \
$(NSPR_LIBS) \
$(NULL)

View File

@ -129,17 +129,16 @@ IS_COMPONENT = 1
endif
endif
include $(topsrcdir)/config/rules.mk
# this is automatically discovered under BeOS
ifneq ($(OS_ARCH),BeOS)
LIBS += \
-lmozjs \
-lxpcom \
-lmozreg \
$(NSPR_LIBS) \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk
DEFINES += -DJSFILE -DJS_THREADSAFE

View File

@ -28,7 +28,6 @@ CPPSRCS = TestSpaceManager.cpp
LOCAL_INCLUDES = -I$(srcdir)/../src
include $(topsrcdir)/config/rules.mk
LIBS += \
-lnetlib \
@ -53,7 +52,6 @@ LIBS += \
-lmozjs \
$(TIMER_LIBS) \
-lxpcom \
-lmozreg \
-lxp \
-ljsurl \
-ljsdom \
@ -62,3 +60,4 @@ LIBS += \
$(TK_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -32,7 +32,7 @@ EXPORTS = nsMsgBaseCID.h
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libmsgbase_s.a \
$(DIST)/lib/librdfutil_s.a \
$(DIST)/lib/libmsgsearch_s.a \
$(DIST)/lib/libmsgsearch_s.a \
$(NULL)
EXTRA_DSO_LDOPTS = \
@ -41,7 +41,6 @@ EXTRA_DSO_LDOPTS = \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/bin \
-lxpcom \
-lmozreg \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(NULL)

View File

@ -29,7 +29,6 @@ LIBS = \
-L$(DIST)/lib \
-L$(DIST)/bin \
-lxpcom \
-lmozreg \
-lmozjs \
$(TIMER_LIBS) \
$(NSPR_LIBS) \

View File

@ -65,7 +65,6 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
-lmozreg \
-lrdfutil_s \
$(NSPR_LIBS) \
$(NULL)

View File

@ -40,7 +40,6 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
-lmozreg \
-lmsgbaseutil \
-lraptorhtmlpars \
$(NSPR_LIBS) \

View File

@ -28,7 +28,6 @@ CPPSRCS = test.cpp
LIBS = \
-lmsgbaseutil \
-lmozreg \
-lxpcom \
-lmozdbm \
-lxp \

View File

@ -39,7 +39,6 @@ LIBS = \
-lnetcnvts \
-lnetwork \
-lnetlib \
-lmozreg \
$(TIMER_LIBS) \
-lxpcom \
-lpwcac \

View File

@ -30,7 +30,6 @@ CPPSRCS = \
$(NULL)
BASE_LIBS = \
-lmozreg \
-lmozjs \
-lxpcom \
-lmozutil \

View File

@ -39,7 +39,6 @@ LIBS = \
-lnetcnvts \
-lnetwork \
-lnetlib \
-lmozreg \
$(TIMER_LIBS) \
-lxpcom \
-lpwcac \

View File

@ -39,7 +39,6 @@ LIBS = \
-lnetcnvts \
-lnetwork \
-lnetlib \
-lmozreg \
$(TIMER_LIBS) \
-lxpcom \
-lpwcac \

View File

@ -36,7 +36,6 @@ LIBS = \
-limg \
-lxp \
-lmozutil \
-lmozreg \
$(TIMER_LIBS) \
$(ZLIB_LIBS) \
$(DIST)/lib/librdfbase_s.a \

View File

@ -40,7 +40,6 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
-lmozreg \
-lrdfutil_s \
-lmsgbaseutil \
$(NSPR_LIBS) \

View File

@ -30,7 +30,6 @@ CPPSRCS = imapProtocolTest.cpp
LIBS = \
-L$(DIST)/lib \
-L$(DIST)/bin \
-lmozreg \
-lxpcom \
-lmozdbm \
-lxp \

View File

@ -41,7 +41,6 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
-lmozreg \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(NULL)

View File

@ -42,7 +42,6 @@ LIBS = \
-lnetcnvts \
-lnetwork \
-lnetlib \
-lmozreg \
-lxpcom \
-lpwcac \
-lmozdbm \

View File

@ -38,7 +38,6 @@ LIBS = \
-lnetcnvts \
-lnetwork \
-lnetlib \
-lmozreg \
-lxpcom \
-lpwcac \
-lmozdbm \

View File

@ -28,7 +28,6 @@ CPPSRCS = pop3Test.cpp
LIBS = \
-lmsgbaseutil \
-lmozreg \
-lxpcom \
-lmozdbm \
-lxp \

View File

@ -40,7 +40,6 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/lib \
-lxpcom \
-labstat_s \
-lmozreg \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -38,7 +38,6 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/lib \
-lxp \
-lxpcom \
-lmozreg \
$(NSPR_LIBS) \
$(NULL)

View File

@ -39,7 +39,6 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
-lmozreg \
$(NSPR_LIBS) \
$(NULL)

View File

@ -40,7 +40,6 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
-lmozreg \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -98,7 +98,6 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/lib \
-lmozjs \
-lxpcom \
-lmozreg \
$(NSPR_LIBS) \
$(NULL)

View File

@ -26,7 +26,6 @@ PROGRAM = mimetest
CPPSRCS = mimetest.cpp
BASE_LIBS = \
-lmozreg \
-lmozjs \
-lxpcom \
-lmozutil \

View File

@ -38,7 +38,6 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
-lmozreg \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(NULL)

View File

@ -38,7 +38,6 @@ LIBS = \
-lnetcnvts \
-lnetwork \
-lnetlib \
-lmozreg \
-lpwcac \
-lmozdbm \
-lxp \

View File

@ -26,7 +26,6 @@ PROGRAM = nntpTest
CPPSRCS = nntpTest.cpp
LIBS = \
-lmozreg \
-lxpcom \
-lmozdbm \
-lxp \

View File

@ -23,7 +23,7 @@ srcdir = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = libreg
LIBRARY_NAME = mozreg
LIBRARY_NAME = mozreg_s
REQUIRES = libreg pref js
@ -32,7 +32,10 @@ CSRCS = reg.c VerReg.c vr_stubs.c
BIN_SRCS = VerReg.c reg.c vr_stubs.c
BIN_OBJS = $(addprefix R_,$(BIN_SRCS:.c=.o))
# force the creation of a static lib.
MKSHLIB :=
# We don't want a shared lib. Static lib only.
override NO_SHARED_LIB=1
override NO_STATIC_LIB=
include $(topsrcdir)/config/rules.mk

View File

@ -41,7 +41,6 @@ LOST_SYM_LIBS = -lxpcomds_s -lxptinfo
endif
LIBS = \
-lmozreg \
-lmozjs \
-lxpcom \
-lmozutil \

View File

@ -52,7 +52,6 @@ LIBS = \
-limg \
-lmozutil \
-lxpcom \
-lmozreg \
$(TIMER_LIBS) \
$(TK_LIBS) \
$(NULL)

View File

@ -30,7 +30,6 @@ CPPSRCS = RobotMain.cpp
LIBS = \
-lDebugRobot \
-lmozreg \
-lxpcom \
$(NSPR_LIBS) \
$(NULL)

View File

@ -29,7 +29,6 @@ CPPSRCS = logparse.cpp
LIBS = \
-lraptorhtmlpars \
-lxpcom \
-lmozreg \
$(NSPR_LIBS) \
$(NULL)

View File

@ -27,7 +27,6 @@ CPPSRCS = localfile.cpp
LIBS = \
-lxpcom \
-lmozreg \
$(NSPR_LIBS) \
$(NULL)

View File

@ -27,7 +27,6 @@ CPPSRCS = rdfcat.cpp
BASE_LIBS = \
$(ZLIB_LIBS) \
-lmozreg \
-lmozjs \
-lxpcom \
-lmozutil \

View File

@ -27,7 +27,6 @@ CPPSRCS = rdfpoll.cpp
BASE_LIBS = \
$(ZLIB_LIBS) \
-lmozreg \
-lmozjs \
-lxpcom \
-lmozutil \

View File

@ -27,7 +27,6 @@ CPPSRCS = rdfsink.cpp
LIBS = \
-lxpcom \
-lmozreg \
$(NSPR_LIBS) \
$(NULL)

View File

@ -25,7 +25,6 @@ ZLIB_LIBS = -lz
TIMER_LIBS = -ltimer_s
BASE_LIBS = \
-lmozreg \
-lmozjs \
$(TIMER_LIBS) \
-lxpcom \

View File

@ -90,7 +90,6 @@ JSJ_LIB = -ljsj
endif
BASE_LIBS = \
-lmozreg \
-lmozjs \
-lxpcom \
-lmozutil \

View File

@ -33,5 +33,5 @@ include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_WIDGET
EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxpcom -lmozreg $(NSPR_LIBS)
EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxpcom $(NSPR_LIBS)

View File

@ -55,7 +55,6 @@ LIBS = \
-lmozutil \
-limg \
-lxpcom \
-lmozreg \
-lmozjs \
-lwidgetsupport_s \
-lraptorgfx \

View File

@ -55,7 +55,6 @@ LIBS = \
-lmozutil \
-limg \
-lxpcom \
-lmozreg \
-lmozjs \
-lwidgetsupport_s \
-lraptorgfx \

View File

@ -40,7 +40,6 @@ SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libxptinfo.a \
$(DIST)/lib/libxpt.a \
$(DIST)/lib/libxptcmd.a \
$(DIST)/lib/libmozreg.a \
$(NULL)
LOCAL_INCLUDES = \
@ -56,6 +55,8 @@ EXTRA_DSO_LDOPTS = \
$(MKSHLIB_FORCE_ALL) \
$(SHARED_LIBRARY_LIBS) \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/lib \
-lmozreg_s \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -66,7 +66,6 @@ endif
LIBS += \
-lraptorgfx \
$(TIMER_LIBS) \
-lmozreg \
-ljsdom \
-ljsurl \
-lmozjs \

View File

@ -32,7 +32,6 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
-lmozreg \
-lmozjs \
$(ZLIB_LIBS) \
$(NSPR_LIBS) \

View File

@ -35,7 +35,6 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
-lmozreg \
$(ZLIB_LIBS) \
$(NSPR_LIBS) \
$(NULL)

View File

@ -32,7 +32,6 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
-lmozreg \
-lnetlib \
$(ZLIB_LIBS) \
$(NSPR_LIBS) \

View File

@ -32,7 +32,6 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
-lmozreg \
-lmozjs \
$(ZLIB_LIBS) \
$(NSPR_LIBS) \

View File

@ -35,7 +35,6 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
-lmozreg \
-lmozjs \
-lneckoutil_s \
$(ZLIB_LIBS) \

View File

@ -64,7 +64,10 @@ CPPSRCS = \
LOCAL_INCLUDES = -I$(srcdir)/../public
EXTRA_DSO_LDOPTS = -L$(DIST)/lib $(ZLIB_LIBS) -lneckoutil_s
EXTRA_DSO_LDOPTS =\
-L$(DIST)/lib \
-lneckoutil_s \
$(ZLIB_LIBS)
include $(topsrcdir)/config/rules.mk