Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 354075. Complete move from toolkit/components/gnome to toolkit/system/gnome. r=bsmedberg

Browse Source
This commit is contained in:
roc+%cs.cmu.edu 2006-09-27 20:17:56 +00:00
parent 3b9ea915e0
commit ec39a5fd88
5 changed files with 58 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
allmakefiles.sh
View File

@ -630,6 +630,7 @@ xpcom/tools/Makefile
xpcom/tools/registry/Makefile
xpcom/stub/Makefile
xpcom/windbgdlg/Makefile
xpcom/system/Makefile
$MAKEFILES_libreg
$MAKEFILES_libjar
intl/unicharutil/public/Makefile
@ -972,7 +973,7 @@ toolkit/components/downloads/public/Makefile
toolkit/components/downloads/Makefile
toolkit/components/downloads/src/Makefile
toolkit/components/filepicker/Makefile
toolkit/components/gnome/Makefile
toolkit/system/gnome/Makefile
toolkit/components/help/Makefile
toolkit/components/history/Makefile
toolkit/components/history/public/Makefile
@ -1229,8 +1230,7 @@ fi
MAKEFILES_gnome="
toolkit/Makefile
toolkit/components/Makefile
toolkit/components/gnome/Makefile
toolkit/system/gnome/Makefile
"
#

15
toolkit/system/gnome/Makefile.in
View File

@ -43,18 +43,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = mozgnome
XPIDLSRCS = \
nsIGConfService.idl \
nsIGnomeVFSService.idl \
$(NULL)
# We always export these interfaces if we're building for gtk2, but
# only compile the component if the required libraries are available.
ifdef MOZ_ENABLE_GNOME_COMPONENT
LIBRARY_NAME = mozgnome
FORCE_SHARED_LIB = 1
IS_COMPONENT = 1
@ -81,8 +69,6 @@ EXTRA_DSO_LDOPTS += \
$(GLIB_LIBS) \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk
CXXFLAGS += \
@ -91,4 +77,3 @@ CXXFLAGS += \
$(MOZ_LIBGNOME_CFLAGS) \
$(GLIB_CFLAGS) \
$(NULL)

8
toolkit/toolkit-tiers.mk
View File

@ -287,12 +287,8 @@ tier_toolkit_staticdirs += directory/c-sdk
tier_toolkit_dirs += directory/xpcom
endif
ifndef MINIMO
ifdef MOZ_XUL_APP
ifdef MOZ_ENABLE_GTK2
tier_toolkit_dirs += toolkit/components/gnome
endif
endif
ifdef MOZ_ENABLE_GNOME_COMPONENT
tier_toolkit_dirs += toolkit/system/gnome
endif
ifdef MOZ_LEAKY

1
xpcom/Makefile.in
View File

@ -57,6 +57,7 @@ DIRS = \
threads \
reflect \
proxy \
system \
build \
$(NULL)

52
xpcom/system/Makefile.in Normal file
View File

@ -0,0 +1,52 @@
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is the Mozilla GNOME interfaces code.
#
# The Initial Developer of the Original Code is
# Novell Corporation.
# Portions created by the Initial Developer are Copyright (C) 2006
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Robert O'Callahan <robert@ocallahan.org>
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xpcom
XPIDLSRCS = \
nsIGConfService.idl \
nsIGnomeVFSService.idl \
$(NULL)
include $(topsrcdir)/config/rules.mk