mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix for EXTRA_DSO_LIBS in rules.mk 

OS/2 Makefile.in changes (Patch 4a).  Bug #34106
This commit is contained in:
cls%seawood.org 2000-04-04 07:37:50 +00:00
Родитель 01e123053b
Коммит 372343f97f
15 изменённых файлов: 95 добавлений и 53 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
config/rules.mk
Просмотреть файл

@ -105,7 +105,7 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP)
EXTRA_DSO_LIBS := $(addsuffix .$(LIB_SUFFIX),$(addprefix $(DIST)/lib/,$(EXTRA_DSO_LIBS)))
EXTRA_DSO_LIBS := $(filter-out %/bin %lib,$(EXTRA_DSO_LIBS))
else
EXTRA_DSO_LIBS := $(addprefix -l,$(EXTRA_DSO_LDOPTS))
EXTRA_DSO_LIBS := $(addprefix -l,$(EXTRA_DSO_LIBS))
endif
ifndef LIBRARY

5
db/mork/build/Makefile.in
Просмотреть файл

@ -37,7 +37,7 @@ EXPORTS = \
nsIMdbFactoryFactory.h \
$(NULL)
SHARED_LIBRARY_LIBS = $(DIST)/lib/libmsgmork_s.a
SHARED_LIBRARY_LIBS = $(DIST)/lib/libmsgmork_s.$(LIB_SUFFIX)
EXTRA_DSO_LDOPTS = \
$(MKSHLIB_FORCE_ALL) \
@ -45,8 +45,7 @@ EXTRA_DSO_LDOPTS = \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

14
gfx/src/ps/Makefile.in
Просмотреть файл

@ -29,6 +29,13 @@ include $(DEPTH)/config/autoconf.mk
MODULE = raptor
LIBRARY_NAME = gfxps
IS_COMPONENT = 1
EXTRA_DSO_LIBS = img_s mozutil_s
ifeq ($(USE_SHORT_LIBNAME),1)
EXTRA_DSO_LIBS += nggfx
else
EXTRA_DSO_LIBS += raptorgfx
endif
CSRCS = font_metrics.c
@ -50,12 +57,9 @@ EXPORTS = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
$(NSPR_LIBS) \
-lxpcom \
-lraptorgfx \
-L$(DIST)/lib \
-limg_s \
-lmozutil_s \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

11
htmlparser/robot/test/Makefile.in
Просмотреть файл

@ -26,17 +26,22 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
PROGRAM = htmlrobot
PROGRAM = htmlrobot$(BIN_SUFFIX)
REQUIRES = xpcom
CPPSRCS = RobotMain.cpp
ifeq ($(USE_SHORT_LIBNAME),1)
EXTRA_DSO_LIBS = dbgrobot
else
EXTRA_DSO_LIBS = DebugRobot
endif
LIBS = \
-lDebugRobot \
$(XPCOM_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/config.mk

7
mailnews/addrbook/build/Makefile.in
Просмотреть файл

@ -34,17 +34,16 @@ CPPSRCS = nsAbFactory.cpp
EXPORTS = nsAbBaseCID.h
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libaddrbook_s.a \
$(DIST)/lib/libaddrbook_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(MKSHLIB_FORCE_ALL) \
$(SHARED_LIBRARY_LIBS) \
$(MKSHLIB_UNFORCE_ALL) \
$(DIST)/lib/librdfutil_s.a \
$(DIST)/lib/librdfutil_s.$(LIB_SUFFIX) \
-L$(DIST)/bin \
$(NSPR_LIBS) \
$(XPCOM_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

17
mailnews/base/build/Makefile.in
Просмотреть файл

@ -30,12 +30,18 @@ MODULE = msgbase
LIBRARY_NAME = mailnews
IS_COMPONENT = 1
ifeq ($(USE_SHORT_LIBNAME),1)
EXTRA_DSO_LIBS = msgbutil
else
EXTRA_DSO_LIBS = msgbaseutil
endif
CPPSRCS = nsMsgFactory.cpp
EXPORTS = nsMsgBaseCID.h
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libmsgbase_s.a \
$(DIST)/lib/libmsgsearch_s.a \
$(DIST)/lib/libmsgbase_s.$(LIB_SUFFIX) \
$(DIST)/lib/libmsgsearch_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_DSO_LDOPTS = \
@ -43,12 +49,11 @@ EXTRA_DSO_LDOPTS = \
$(SHARED_LIBRARY_LIBS) \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/lib \
$(DIST)/lib/librdfutil_s.a \
$(DIST)/lib/librdfutil_s.$(LIB_SUFFIX) \
$(MOZ_TIMER_LIBS) \
-L$(DIST)/bin \
$(XPCOM_LIBS) \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

12
mailnews/db/msgdb/build/Makefile.in
Просмотреть файл

@ -30,10 +30,16 @@ MODULE = msgdb
LIBRARY_NAME = msgdb
IS_COMPONENT = 1
ifeq ($(USE_SHORT_LIBNAME),1)
EXTRA_DSO_LIBS = msgbutil
else
EXTRA_DSO_LIBS = msgbaseutil
endif
CPPSRCS = nsMsgDBFactory.cpp
EXPORTS = nsMsgDBCID.h
SHARED_LIBRARY_LIBS = $(DIST)/lib/libmsgdb_s.a
SHARED_LIBRARY_LIBS = $(DIST)/lib/libmsgdb_s.$(LIB_SUFFIX)
EXTRA_DSO_LDOPTS = \
$(MKSHLIB_FORCE_ALL) \
@ -41,9 +47,7 @@ EXTRA_DSO_LDOPTS = \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(XPCOM_LIBS) \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

15
mailnews/local/build/Makefile.in
Просмотреть файл

@ -28,13 +28,20 @@ include $(DEPTH)/config/autoconf.mk
MODULE = msglocal
LIBRARY_NAME = localmail
SHORT_LIBNAME = msglocal
IS_COMPONENT = 1
ifeq ($(USE_SHORT_LIBNAME),1)
EXTRA_DSO_LIBS = msgbutil
else
EXTRA_DSO_LIBS = msgbaseutil
endif
CPPSRCS = nsMsgLocalFactory.cpp
EXPORTS = nsMsgLocalCID.h
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libmsglocal_s.a \
$(DIST)/lib/libmsglocal_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_DSO_LDOPTS = \
@ -42,11 +49,9 @@ EXTRA_DSO_LDOPTS = \
$(SHARED_LIBRARY_LIBS) \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/lib \
$(DIST)/lib/librdfutil_s.a \
$(DIST)/lib/librdfutil_s.$(LIB_SUFFIX) \
-L$(DIST)/bin \
$(XPCOM_LIBS) \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

12
mailnews/mime/build/Makefile.in
Просмотреть файл

@ -30,11 +30,17 @@ MODULE = mime
LIBRARY_NAME = mime
IS_COMPONENT = 1
ifeq ($(USE_SHORT_LIBNAME),1)
EXTRA_DSO_LIBS = msgbutil
else
EXTRA_DSO_LIBS = msgbaseutil
endif
CPPSRCS = nsMimeModule.cpp
EXPORTS = nsMsgMimeCID.h
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libmime_s.a \
$(DIST)/lib/libmime_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_DSO_LDOPTS = \
@ -43,9 +49,7 @@ EXTRA_DSO_LDOPTS = \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(XPCOM_LIBS) \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

11
mailnews/mime/cthandlers/vcard/Makefile.in
Просмотреть файл

@ -30,6 +30,12 @@ MODULE = vcard
LIBRARY_NAME = vcard
IS_COMPONENT = 1
ifeq ($(USE_SHORT_LIBNAME),1)
EXTRA_DSO_LIBS = msgbutil
else
EXTRA_DSO_LIBS = msgbaseutil
endif
CPPSRCS = \
mimevcrd.cpp \
mimexpcom.cpp \
@ -42,9 +48,8 @@ CPPSRCS = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(XPCOM_LIBS) \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

6
mailnews/mime/emitters/build/Makefile.in
Просмотреть файл

@ -28,13 +28,14 @@ include $(DEPTH)/config/autoconf.mk
MODULE = mimeemitter
LIBRARY_NAME = mimeemitter
SHORT_LIBNAME = mimemitr
IS_COMPONENT = 1
CPPSRCS = nsEmitterFactory.cpp
EXPORTS = nsMimeEmitterCID.h
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libemitterutil_s.a \
$(DIST)/lib/libemitterutil_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_DSO_LDOPTS = \
@ -42,8 +43,7 @@ EXTRA_DSO_LDOPTS = \
$(SHARED_LIBRARY_LIBS) \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/bin \
$(NSPR_LIBS) \
$(XPCOM_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

11
netwerk/cache/build/Makefile.in поставляемый
Просмотреть файл

@ -24,16 +24,17 @@ include $(DEPTH)/config/autoconf.mk
MODULE = nkcache
LIBRARY_NAME = necko_cache
SHORT_LIBNAME = nkcache
IS_COMPONENT = 1
CPPSRCS = nsNetDataCacheModule.cpp
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libnkcachemgr_s.a \
$(DIST)/lib/libnkfilecache_s.a \
$(DIST)/lib/libnkmemcache_s.a \
$(DIST)/lib/libmozdbm_s.a \
$(DIST)/lib/libxpcomio_s.a \
$(DIST)/lib/libnkcachemgr_s.$(LIB_SUFFIX) \
$(DIST)/lib/libnkfilecache_s.$(LIB_SUFFIX) \
$(DIST)/lib/libnkmemcache_s.$(LIB_SUFFIX) \
$(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX) \
$(DIST)/lib/libxpcomio_s.$(LIB_SUFFIX) \
$(NULL)
LOCAL_INCLUDES = \

11
parser/htmlparser/robot/test/Makefile.in
Просмотреть файл

@ -26,17 +26,22 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
PROGRAM = htmlrobot
PROGRAM = htmlrobot$(BIN_SUFFIX)
REQUIRES = xpcom
CPPSRCS = RobotMain.cpp
ifeq ($(USE_SHORT_LIBNAME),1)
EXTRA_DSO_LIBS = dbgrobot
else
EXTRA_DSO_LIBS = DebugRobot
endif
LIBS = \
-lDebugRobot \
$(XPCOM_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/config.mk

6
uriloader/build/Makefile.in
Просмотреть файл

@ -28,12 +28,13 @@ include $(DEPTH)/config/autoconf.mk
MODULE = uriloader
LIBRARY_NAME = uriloader
SHORT_LIBNAME = uriloadr
IS_COMPONENT = 1
CPPSRCS = nsURILoaderModule.cpp
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/liburiloaderbase_s.a \
$(DIST)/lib/liburiloaderbase_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_DSO_LDOPTS = \
@ -42,8 +43,7 @@ EXTRA_DSO_LDOPTS = \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/lib \
-L$(DIST)/bin \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

8
view/src/Makefile.in
Просмотреть файл

@ -28,8 +28,15 @@ include $(DEPTH)/config/autoconf.mk
MODULE = raptor
LIBRARY_NAME = raptorview
SHORT_LIBNAME = ngview
IS_COMPONENT = 1
ifeq ($(USE_SHORT_LIBNAME),1)
EXTRA_DSO_LIBS = nggfx
else
EXTRA_DSO_LIBS = raptorgfx
endif
CPPSRCS = \
nsView.cpp \
nsScrollingView.cpp \
@ -43,7 +50,6 @@ REQUIRES = raptor xpcom
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-lraptorgfx \
$(MOZ_TIMER_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)