bug 882907: move SDK_LIBRARY to mozbuild. r=mshal
authorJoey Armstrong <joey@mozilla.com>
Fri, 20 Sep 2013 18:00:48 -0400
changeset 150348 120d13ba7b71eb36bc1457b8420a6c7fbbfd7c8e
parent 150347 2fe343b79664065bf11a13f212601c03970b25a3
child 150349 567e911cf4d587f023c82e6c0d0e92ec66f7feab
push idunknown
push userunknown
push dateunknown
reviewersmshal
bugs882907
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 882907: move SDK_LIBRARY to mozbuild. r=mshal
xpcom/glue/Makefile.in
xpcom/glue/moz.build
xpcom/glue/nomozalloc/Makefile.in
xpcom/glue/nomozalloc/moz.build
xpcom/glue/standalone/Makefile.in
xpcom/glue/standalone/moz.build
xpcom/glue/standalone/staticruntime/Makefile.in
xpcom/glue/standalone/staticruntime/moz.build
xpcom/glue/staticruntime/Makefile.in
xpcom/glue/staticruntime/moz.build
--- a/xpcom/glue/Makefile.in
+++ b/xpcom/glue/Makefile.in
@@ -5,20 +5,16 @@
 
 
 DIST_INSTALL	= 1
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../build \
 		$(NULL)
 
-SDK_LIBRARY     =                        \
-		$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
-		$(NULL)
-
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef _MSC_VER
 # Don't include directives about which CRT to use
 OS_COMPILE_CXXFLAGS += -Zl
 OS_COMPILE_CFLAGS += -Zl
--- a/xpcom/glue/moz.build
+++ b/xpcom/glue/moz.build
@@ -93,8 +93,12 @@ CPP_SOURCES += xpcom_gluens_src_cppsrcs
 CPP_SOURCES += xpcom_glue_src_cppsrcs
 
 CPP_SOURCES += [
     'GenericModule.cpp',
     'nsStringAPI.cpp',
 ]
 
 LIBRARY_NAME = 'xpcomglue_s'
+
+SDK_LIBRARY = [
+    "%s%s.%s" % (CONFIG['LIB_PREFIX'], 'xpcomglue_s', CONFIG['LIB_SUFFIX']),
+]
--- a/xpcom/glue/nomozalloc/Makefile.in
+++ b/xpcom/glue/nomozalloc/Makefile.in
@@ -5,20 +5,16 @@
 
 
 DIST_INSTALL	= 1
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../build \
 		$(NULL)
 
-SDK_LIBRARY     =                        \
-		$(LIB_PREFIX)xpcomglue_s_nomozalloc.$(LIB_SUFFIX) \
-		$(NULL)
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 # Pretend we're statically linking the CRT, even though we might not be: this
 # avoids "msvcrp" and assembly dependencies from creeping into the directives
 # for this library on Windows.
 USE_STATIC_LIBS = 1
 
--- a/xpcom/glue/nomozalloc/moz.build
+++ b/xpcom/glue/nomozalloc/moz.build
@@ -13,8 +13,11 @@ CPP_SOURCES += xpcom_glue_src_cppsrcs
 
 CPP_SOURCES += [
     '../GenericModule.cpp',
     '../nsStringAPI.cpp',
 ]
 
 LIBRARY_NAME = 'xpcomglue_s_nomozalloc'
 
+SDK_LIBRARY = [
+    "%s%s.%s" % (CONFIG['LIB_PREFIX'], 'xpcomglue_s_nomozalloc', CONFIG['LIB_SUFFIX']),
+]
--- a/xpcom/glue/standalone/Makefile.in
+++ b/xpcom/glue/standalone/Makefile.in
@@ -5,20 +5,16 @@
 
 
 DIST_INSTALL	= 1
 
 LOCAL_INCLUDES	= \
 	-I$(srcdir)/../../build \
 	$(NULL)
 
-SDK_LIBRARY     	= \
-	$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
-	$(NULL)
-
 FORCE_STATIC_LIB = 1
 
 # Don't use STL wrappers here (i.e. wrapped <new>); they require mozalloc
 STL_FLAGS	=
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef _MSC_VER
--- a/xpcom/glue/standalone/moz.build
+++ b/xpcom/glue/standalone/moz.build
@@ -20,8 +20,12 @@ CPP_SOURCES += [
     'nsXPCOMGlue.cpp',
 ]
 
 LIBRARY_NAME = 'xpcomglue'
 
 EXPORTS += [
     'nsXPCOMGlue.h',
 ]
+
+SDK_LIBRARY = [
+    "%s%s.%s" % (CONFIG['LIB_PREFIX'], 'xpcomglue', CONFIG['LIB_SUFFIX']),
+]
--- a/xpcom/glue/standalone/staticruntime/Makefile.in
+++ b/xpcom/glue/standalone/staticruntime/Makefile.in
@@ -4,20 +4,16 @@
 
 
 DIST_INSTALL	= 1
 
 LOCAL_INCLUDES	= \
 	-I$(srcdir)/../../../build \
 	$(NULL)
 
-SDK_LIBRARY     	= \
-	$(LIB_PREFIX)xpcomglue_staticruntime.$(LIB_SUFFIX) \
-	$(NULL)
-
 # create a static lib
 FORCE_STATIC_LIB = 1
 
 # Statically link to the CRT on Windows
 USE_STATIC_LIBS = 1
 
 # Don't use STL wrappers here (i.e. wrapped <new>); they require mozalloc
 STL_FLAGS	=
--- a/xpcom/glue/standalone/staticruntime/moz.build
+++ b/xpcom/glue/standalone/staticruntime/moz.build
@@ -12,8 +12,11 @@ CPP_SOURCES += xpcom_glue_src_cppsrcs
 
 CPP_SOURCES += [
     '../../nsStringAPI.cpp',
     '../nsXPCOMGlue.cpp',
 ]
 
 LIBRARY_NAME = 'xpcomglue_staticruntime'
 
+SDK_LIBRARY = [
+    "%s%s.%s" % (CONFIG['LIB_PREFIX'], 'xpcomglue_staticruntime', CONFIG['LIB_SUFFIX']),
+]
--- a/xpcom/glue/staticruntime/Makefile.in
+++ b/xpcom/glue/staticruntime/Makefile.in
@@ -5,20 +5,16 @@
 
 
 DIST_INSTALL	= 1
 
 LOCAL_INCLUDES	= \
 	-I$(srcdir)/../../build \
 	$(NULL)
 
-SDK_LIBRARY     	= \
-	$(LIB_PREFIX)xpcomglue_staticruntime_s.$(LIB_SUFFIX) \
-	$(NULL)
-
 FORCE_STATIC_LIB = 1
 
 # Statically link to the CRT on Windows
 USE_STATIC_LIBS = 1
 
 # Don't use STL wrappers here (i.e. wrapped <new>); they require mozalloc
 STL_FLAGS	=
 
--- a/xpcom/glue/staticruntime/moz.build
+++ b/xpcom/glue/staticruntime/moz.build
@@ -13,8 +13,12 @@ CPP_SOURCES += xpcom_glue_src_cppsrcs
 
 CPP_SOURCES += [
     '../GenericModule.cpp',
     '../nsStringAPI.cpp',
 ]
 
 LIBRARY_NAME = 'xpcomglue_staticruntime_s'
 
+SDK_LIBRARY = [
+    "%s%s.%s" % (CONFIG['LIB_PREFIX'], 'xpcomglue_staticruntime_s', CONFIG['LIB_SUFFIX']),
+]
+