Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-27 15:55:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 494172 - Static libs such as libxpcomglue_s are not shipped in the XUL SDK: revert the parts of bug 488175 which were too eager: we still use dist/sdk/lib and dist/sdk/bin, just not dist/sdk/include or dist/sdk/idl, r=ted

Browse Source
This commit is contained in:
Benjamin Smedberg 2009-05-21 14:12:46 -04:00
parent 4ca8218c31
commit 25229c3604
4 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.mk
View File

@ -630,6 +630,9 @@ ifdef LIBXUL_SDK
XPIDL_FLAGS += -I$(LIBXUL_SDK)/idl
endif
SDK_LIB_DIR = $(DIST)/sdk/lib
SDK_BIN_DIR = $(DIST)/sdk/bin
DEPENDENCIES = .md
MOZ_COMPONENT_LIBS=$(XPCOM_LIBS) $(MOZ_COMPONENT_NSPR_LIBS)

25
config/rules.mk
View File

@ -1823,6 +1823,31 @@ endif
endif
################################################################################
# SDK
ifneq (,$(SDK_LIBRARY))
$(SDK_LIB_DIR)::
$(NSINSTALL) -D $@
ifndef NO_DIST_INSTALL
libs:: $(SDK_LIBRARY) $(SDK_LIB_DIR)
$(INSTALL) $(IFLAGS2) $^
endif
endif # SDK_LIBRARY
ifneq (,$(SDK_BINARY))
$(SDK_BIN_DIR)::
$(NSINSTALL) -D $@
ifndef NO_DIST_INSTALL
libs:: $(SDK_BINARY) $(SDK_BIN_DIR)
$(INSTALL) $(IFLAGS2) $^
endif
endif # SDK_BINARY
################################################################################
# CHROME PACKAGING

3
js/src/config/config.mk
View File

@ -630,6 +630,9 @@ ifdef LIBXUL_SDK
XPIDL_FLAGS += -I$(LIBXUL_SDK)/idl
endif
SDK_LIB_DIR = $(DIST)/sdk/lib
SDK_BIN_DIR = $(DIST)/sdk/bin
DEPENDENCIES = .md
MOZ_COMPONENT_LIBS=$(XPCOM_LIBS) $(MOZ_COMPONENT_NSPR_LIBS)

25
js/src/config/rules.mk
View File

@ -1823,6 +1823,31 @@ endif
endif
################################################################################
# SDK
ifneq (,$(SDK_LIBRARY))
$(SDK_LIB_DIR)::
$(NSINSTALL) -D $@
ifndef NO_DIST_INSTALL
libs:: $(SDK_LIBRARY) $(SDK_LIB_DIR)
$(INSTALL) $(IFLAGS2) $^
endif
endif # SDK_LIBRARY
ifneq (,$(SDK_BINARY))
$(SDK_BIN_DIR)::
$(NSINSTALL) -D $@
ifndef NO_DIST_INSTALL
libs:: $(SDK_BINARY) $(SDK_BIN_DIR)
$(INSTALL) $(IFLAGS2) $^
endif
endif # SDK_BINARY
################################################################################
# CHROME PACKAGING