Bug 904364 - Don't build an empty (fake) library in toolkit/components/osfile. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 15 Aug 2013 23:45:06 +0900
changeset 142773 03e1d975aa81cddc347cd76b3fe70affba046634
parent 142772 9c90bda449925de88dfb3840d34168fdf6c48d55
child 142774 0e91dc91caf177531722ee33ef74da6ad1d664d2
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersmshal
bugs904364
milestone26.0a1
Bug 904364 - Don't build an empty (fake) library in toolkit/components/osfile. r=mshal
toolkit/components/osfile/Makefile.in
toolkit/components/osfile/moz.build
toolkit/library/Makefile.in
deleted file mode 100644
--- a/toolkit/components/osfile/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBXUL_LIBRARY  = 1
-
-include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/osfile/moz.build
+++ b/toolkit/components/osfile/moz.build
@@ -7,14 +7,12 @@
 DIRS += [
     'modules',
 ]
 
 TEST_DIRS += ['tests']
 
 MODULE = 'osfile'
 
-LIBRARY_NAME = 'osfile_s'
-
 EXTRA_PP_JS_MODULES += [
     'osfile.jsm',
 ]
 
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -22,17 +22,16 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 # as-is so that dependencies of the form -ltracemalloc still work.
 MAKE_FRAMEWORK=1
 endif
 
 VPATH += $(topsrcdir)/build/
 
 SHARED_LIBRARY_LIBS += \
   $(DEPTH)/media/kiss_fft/$(LIB_PREFIX)kiss_fft.$(LIB_SUFFIX) \
-  $(DEPTH)/toolkit/components/osfile/$(LIB_PREFIX)osfile_s.$(LIB_SUFFIX) \
   $(DEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) \
   $(NULL)
 
 ifdef ACCESSIBILITY
 SHARED_LIBRARY_LIBS += \
   $(DEPTH)/accessible/src/base/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \
   $(DEPTH)/accessible/src/generic/$(LIB_PREFIX)accessibility_generic_s.$(LIB_SUFFIX) \
   $(DEPTH)/accessible/src/html/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \