Bug 1043045 - Port |Bug 1036894 - Move in-tree library linkage information to moz.build| to im. r=clokep a=im-only-bustage-fix

--HG--
extra : amend_source : d83c9d608f6ca3a427981b006b1c371a3b32d5b1

im/app/Makefile.in

@@ -53,12 +53,8 @@ DIST_FILES = application.ini
 DEFINES += -DXPCOM_GLUE
 STL_FLAGS=
 
-LIBS += \
-	$(XPCOM_STANDALONE_GLUE_LDOPTS) \
-	$(NULL)
-
 ifdef MOZ_LINKER
-LIBS += $(MOZ_ZLIB_LIBS)
+OS_LIBS += $(MOZ_ZLIB_LIBS)
 endif
 
 ifndef MOZ_WINCONSOLE

im/app/moz.build

@@ -13,3 +13,7 @@ if not CONFIG['LIBXUL_SDK']:
         '/mozilla/xpcom/base',
         '/mozilla/xpcom/build',
     ]
+
+    USE_LIBS += [
+        'xpcomglue',
+    ]

im/components/mintrayr/Makefile.in

@@ -25,11 +25,6 @@ OS_LIBS += $(TK_LIBS) $(XLIBS)
 endif # gtk2
 endif # windows
 
-#USE_STATIC_LIBS = 1
-EXTRA_DSO_LDOPTS += $(XPCOM_GLUE_LDOPTS) $(MOZ_COMPONENT_NSPR_LIBS)
-#EXTRA_DSO_LDOPTS += \
-		$(XPCOM_GLUE_LDOPTS) \
-		$(NSPR_LIBS) \
-		$(NULL)
+EXTRA_LIBS += $(NSPR_LIBS)
 
 include $(topsrcdir)/config/rules.mk

im/components/mintrayr/moz.build

@@ -15,7 +15,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
     SOURCES += ['trayPlatformGtk2.cpp']
 
 IS_COMPONENT = True
-FORCE_SHARED_LIB = True
 
 LIBRARY_NAME = 'trayToolkit'
 
@@ -30,3 +29,9 @@ EXPORTS += [
 ]
 
 JAR_MANIFESTS += ['jar.mn']
+
+USE_LIBS += [
+    'mozalloc',
+    'xpcomglue_s',
+    'xul',
+]