Bug 914270 - Part 2: Manual moves. r=joey

db/sqlite3/src/Makefile.in

@@ -4,9 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SHORT_LIBNAME    = mozsqlt3
-ifdef MOZ_FOLD_LIBS
-FORCE_STATIC_LIB = 1
-else
+ifndef MOZ_FOLD_LIBS
 FORCE_SHARED_LIB = 1
 endif
 VISIBILITY_FLAGS =

db/sqlite3/src/moz.build

@@ -16,3 +16,5 @@ SOURCES += [
     'sqlite3.c',
 ]
 
+if CONFIG['MOZ_FOLD_LIBS']:
+    FORCE_STATIC_LIB = True

gfx/graphite2/src/Makefile.in

@@ -17,7 +17,6 @@ include $(srcdir)/files.mk
 # on Windows, we're going to link graphite with gkmedias instead of libxul
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
-FORCE_STATIC_LIB = 1
 endif
 
 ifeq (WINNT,$(OS_TARGET))

gfx/graphite2/src/moz.build

@@ -6,11 +6,10 @@
 
 MODULE = 'graphite2'
 
-if CONFIG['OS_TARGET'] != 'WINNT':
-    LIBXUL_LIBRARY = True
+if CONFIG['OS_TARGET'] == 'WINNT':
+    FORCE_STATIC_LIB = True
 else:
-    # FORCE_STATIC_LIB = True
-    pass
+    LIBXUL_LIBRARY = True
 
 # This should contain all of the _PUBLIC_HEADERS from files.mk
 EXPORTS.graphite2 += [

gfx/harfbuzz/src/Makefile.in

@@ -24,11 +24,6 @@
 # Mozilla author(s): Jonathan Kew
 #
 
-
-ifeq ($(OS_ARCH),WINNT)
-FORCE_STATIC_LIB = 1
-endif
-
 LOCAL_INCLUDES  += -I$(srcdir) 
 
 

gfx/harfbuzz/src/moz.build

@@ -6,11 +6,10 @@
 
 MODULE = 'harfbuzz'
 
-if CONFIG['OS_ARCH'] != 'WINNT':
-    LIBXUL_LIBRARY = True
+if CONFIG['OS_ARCH'] == 'WINNT':
+    FORCE_STATIC_LIB = True
 else:
-    # FORCE_STATIC_LIB = True
-    pass
+    LIBXUL_LIBRARY = True
 
 EXPORTS.harfbuzz += [
     'hb-blob.h',

gfx/ots/src/Makefile.in

@@ -27,7 +27,6 @@
 
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
-FORCE_STATIC_LIB = 1
 endif
 
 CSRCS =   \

gfx/ots/src/moz.build

@@ -6,11 +6,10 @@
 
 MODULE = 'ots'
 
-if CONFIG['OS_TARGET'] != 'WINNT':
-    LIBXUL_LIBRARY = True
+if CONFIG['OS_TARGET'] == 'WINNT':
+    FORCE_STATIC_LIB = True
 else:
-    # FORCE_STATIC_LIB = True
-    pass
+    LIBXUL_LIBRARY = True
 
 EXPORTS += [
     '../include/opentype-sanitiser.h',

memory/mozalloc/Makefile.in

@@ -11,9 +11,7 @@ endif
 
 DIST_INSTALL 	= 1
 
-ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
-FORCE_STATIC_LIB= 1
-else
+ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
 FORCE_SHARED_LIB= 1
 endif
 

memory/mozalloc/moz.build

@@ -43,3 +43,5 @@ SOURCES += [
 
 LIBRARY_NAME = 'mozalloc'
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+    FORCE_STATIC_LIB = True

memory/mozjemalloc/Makefile.in

@@ -4,8 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ifndef MOZ_JEMALLOC3
-FORCE_STATIC_LIB= 1
-
 ifeq ($(OS_ARCH),SunOS)
 ifndef GNU_CC
 MODULE_OPTIMIZE_FLAGS = -xO5

memory/mozjemalloc/moz.build

@@ -15,4 +15,4 @@ if not CONFIG['MOZ_JEMALLOC3']:
         'jemalloc.c',
     ]
     LIBRARY_NAME = 'jemalloc'
-
+    FORCE_STATIC_LIB = True

mozglue/build/Makefile.in

@@ -9,8 +9,6 @@ DIST_INSTALL = 1
 # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in
 ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
 FORCE_SHARED_LIB = 1
-else
-FORCE_STATIC_LIB = 1
 endif
 
 # Keep jemalloc separated when mozglue is statically linked

mozglue/build/moz.build

@@ -12,10 +12,9 @@ if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'):
     # TODO: These should be the all-caps variables when FORCE_SHARED_LIB and
     # FORCE_STATIC_LIB are ported over
     force_shared_lib = 1
-    force_static_lib = 0
 else:
     force_shared_lib = 0
-    force_static_lib = 1
+    FORCE_STATIC_LIB = True
 
 if CONFIG['MOZ_MEMORY'] and (CONFIG['MOZ_NATIVE_JEMALLOC'] or force_shared_lib):
     pass