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

Bug 78087 - don't export intermediate libraries - initial makefile changes to switch from $(DIST)/lib to in-tree library locations - blanket-r=mento

This commit is contained in:
benjamin%smedbergs.us 2006-02-14 15:57:04 +00:00
Родитель a1c8cbf9d9
Коммит 51e6d212be
5 изменённых файлов: 23 добавлений и 19 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -64,13 +64,13 @@ CPPSRCS = nsAccessibilityFactory.cpp
LOCAL_INCLUDES = -I$(srcdir)/../src LOCAL_INCLUDES = -I$(srcdir)/../src
SHARED_LIBRARY_LIBS = \ SHARED_LIBRARY_LIBS = \
$(DIST)/lib/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \ ../src/base/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \ ../src/html/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX) \ ../src/$(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX) \
$(NULL) $(NULL)
ifdef MOZ_XUL ifdef MOZ_XUL
SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX) SHARED_LIBRARY_LIBS += ../src/xul/$(LIB_PREFIX)accessibility_xul_s.$(LIB_SUFFIX)
endif endif
EXTRA_DSO_LIBS = \ EXTRA_DSO_LIBS = \

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

@ -44,19 +44,21 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk include $(DEPTH)/config/autoconf.mk
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
DIRS += atk PLATFORM_DIR = atk
else else
ifeq ($(MOZ_WIDGET_TOOLKIT),windows) ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
DIRS += msaa PLATFORM_DIR = msaa
else else
ifeq ($(MOZ_WIDGET_TOOLKIT),mac) ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
DIRS += mac PLATFORM_DIR += mac
else else
DIRS += other PLATFORM_DIR += other
endif endif
endif endif
endif endif
DIRS += $(PLATFORM_DIR)
DIRS += \ DIRS += \
base \ base \
html \ html \
@ -68,3 +70,5 @@ endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
libs::
$(NSINSTALL) $(PLATFORM_DIR)/$(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX) .

10
browser/components/build/Makefile.in
Просмотреть файл

@ -52,11 +52,11 @@ OS_LIBS += $(call EXPAND_LIBNAME,version)
endif endif
SHARED_LIBRARY_LIBS = \ SHARED_LIBRARY_LIBS = \
$(DIST)/lib/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX) \ ../migration/src/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX) \
$(NULL) $(NULL)
ifneq (,$(filter windows mac cocoa gtk2, $(MOZ_WIDGET_TOOLKIT))) ifneq (,$(filter windows mac cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))
SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX) SHARED_LIBRARY_LIBS += ../shell/src/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
endif endif
ifdef MOZ_PLACES ifdef MOZ_PLACES
@ -76,10 +76,10 @@ REQUIRES += \
$(NULL) $(NULL)
LOCAL_INCLUDES += -I$(srcdir)/../places/src LOCAL_INCLUDES += -I$(srcdir)/../places/src
SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)places_s.$(LIB_SUFFIX) SHARED_LIBRARY_LIBS += ../places/src/$(LIB_PREFIX)places_s.$(LIB_SUFFIX)
else else
SHARED_LIBRARY_LIBS += \ SHARED_LIBRARY_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \ ../bookmarks/src/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \
$(NULL) $(NULL)
endif endif
@ -98,7 +98,7 @@ EXTRA_DSO_LDOPTS += \
$(NULL) $(NULL)
ifdef MOZ_PLACES ifdef MOZ_PLACES
EXTRA_DSO_LDOPTS += $(DIST)/lib/$(LIB_PREFIX)morkreader_s.$(LIB_SUFFIX) EXTRA_DSO_LDOPTS += $(DEPTH)/db/morkreader/$(LIB_PREFIX)morkreader_s.$(LIB_SUFFIX)
endif endif
# Need to link to CoreFoundation for Mac Migrators (PList reading code) # Need to link to CoreFoundation for Mac Migrators (PList reading code)

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

@ -61,7 +61,7 @@ EXPORTS = \
nsIMdbFactoryFactory.h \ nsIMdbFactoryFactory.h \
$(NULL) $(NULL)
SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)msgmork_s.$(LIB_SUFFIX) SHARED_LIBRARY_LIBS = ../src/$(LIB_PREFIX)msgmork_s.$(LIB_SUFFIX)
EXTRA_DSO_LDOPTS = \ EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \ $(LIBS_DIR) \

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

@ -99,11 +99,11 @@ CPPSRCS = \
$(NULL) $(NULL)
SHARED_LIBRARY_LIBS= \ SHARED_LIBRARY_LIBS= \
$(DIST)/lib/$(LIB_PREFIX)basedocshell_s.$(LIB_SUFFIX) \ ../base/$(LIB_PREFIX)basedocshell_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)uriloaderbase_s.$(LIB_SUFFIX) \ $(DEPTH)/uriloader/base/$(LIB_PREFIX)uriloaderbase_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)exthandler_s.$(LIB_SUFFIX) \ $(DEPTH)/uriloader/exthandler/$(LIB_PREFIX)exthandler_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)prefetch_s.$(LIB_SUFFIX) \ $(DEPTH)/uriloader/prefetch/$(LIB_PREFIX)prefetch_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)shistory_s.$(LIB_SUFFIX) \ ../shistory/src/$(LIB_PREFIX)shistory_s.$(LIB_SUFFIX) \
$(NULL) $(NULL)
EXTRA_DSO_LDOPTS= \ EXTRA_DSO_LDOPTS= \