Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-26 12:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 974217 - Remove the non-standalone part of dirserviceprovider; r=glandium

Browse Source 
--HG--
rename : profile/dirserviceprovider/standalone/Makefile.in => profile/dirserviceprovider/src/Makefile.in
This commit is contained in:
Ehsan Akhgari 2014-02-19 13:14:11 -05:00
parent aaa382a629
commit 1995627120
6 changed files with 7 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embedding/tests/winEmbed/Makefile.in
View File

@ -28,7 +28,7 @@
# ***** END LICENSE BLOCK *****
LIBS = \
$(DEPTH)/profile/dirserviceprovider/standalone/$(LIB_PREFIX)profdirserviceprovidersa_s.$(LIB_SUFFIX) \
$(DEPTH)/profile/dirserviceprovider/src/$(LIB_PREFIX)profdirserviceprovidersa_s.$(LIB_SUFFIX) \
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
$(NULL)

2
profile/dirserviceprovider/moz.build
View File

@ -4,5 +4,5 @@
# 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/.
DIRS += ['public', 'src', 'standalone']
DIRS += ['public', 'src']

0
profile/dirserviceprovider/standalone/Makefile.in → profile/dirserviceprovider/src/Makefile.in
View File

11
profile/dirserviceprovider/src/moz.build
View File

@ -4,13 +4,12 @@
# 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/.
include('objs.mozbuild')
UNIFIED_SOURCES += ['nsProfileDirServiceProvider.cpp']
if CONFIG['MOZ_PROFILELOCKING']:
UNIFIED_SOURCES += ['nsProfileLock.cpp']
UNIFIED_SOURCES += modules_profiledirservice_src_csrcs
LIBRARY_NAME = 'profdirserviceprovidersa_s'
LIBRARY_NAME = 'profdirserviceprovider_s'
# we don't want the shared lib
FORCE_STATIC_LIB = True
DEFINES['MOZILLA_INTERNAL_API'] = True
DEFINES['XPCOM_GLUE'] = 1

19
profile/dirserviceprovider/src/objs.mozbuild
View File

@ -1,19 +0,0 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# 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/.
modules_profiledirservice_src_lcsrcs = [
'nsProfileDirServiceProvider.cpp',
]
if CONFIG['MOZ_PROFILELOCKING']:
modules_profiledirservice_src_lcsrcs += [
'nsProfileLock.cpp',
]
modules_profiledirservice_src_csrcs = [
'%s/profile/dirserviceprovider/src/%s' % (TOPSRCDIR, s) \
for s in sorted(modules_profiledirservice_src_lcsrcs)
]

20
profile/dirserviceprovider/standalone/moz.build
View File

@ -1,20 +0,0 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# 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/.
include('../src/objs.mozbuild')
UNIFIED_SOURCES += modules_profiledirservice_src_csrcs
LIBRARY_NAME = 'profdirserviceprovidersa_s'
FORCE_STATIC_LIB = True
DEFINES['XPCOM_GLUE'] = 1
LOCAL_INCLUDES += [
'../src',
]