--- a/dom/ipc/Makefile.in
+++ b/dom/ipc/Makefile.in
@@ -79,27 +79,27 @@ CPPSRCS = \
TabMessageUtils.cpp \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += \
- -I$(srcdir)/../../content/base/src \
- -I$(srcdir)/../../content/events/src \
- -I$(srcdir)/../../toolkit/components/places/src \
- -I$(topsrcdir)/chrome/src \
- -I$(topsrcdir)/uriloader/exthandler \
- -I$(srcdir)/../../netwerk/base/src \
- -I$(srcdir)/../src/base \
- -I$(srcdir)/../src/storage \
- -I$(srcdir)/../../xpcom/base \
- -I$(topsrcdir)/extensions/cookie \
- $(NULL)
+ -I$(srcdir)/../../content/base/src \
+ -I$(srcdir)/../../content/events/src \
+ -I$(srcdir)/../../toolkit/components/places \
+ -I$(topsrcdir)/chrome/src \
+ -I$(topsrcdir)/uriloader/exthandler \
+ -I$(srcdir)/../../netwerk/base/src \
+ -I$(srcdir)/../src/base \
+ -I$(srcdir)/../src/storage \
+ -I$(srcdir)/../../xpcom/base \
+ -I$(topsrcdir)/extensions/cookie \
+ $(NULL)
DEFINES += -DBIN_SUFFIX='"$(BIN_SUFFIX)"'
ifdef MOZ_PERMISSIONS
DEFINES += -DMOZ_PERMISSIONS
endif
CXXFLAGS += $(TK_CFLAGS)
--- a/toolkit/Makefile.in
+++ b/toolkit/Makefile.in
@@ -14,18 +14,20 @@
# The Original Code is mozilla.org build system.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 2002
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
+# Ben Goodger <ben@bengoodger.com>
# Brian Ryner <bryner@brianryner.com>
# Pierre Chanial <chanial@noos.fr>
+# Shawn Wilsher <me@shawnwilsher.com>
#
# 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
@@ -42,23 +44,36 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
PARALLEL_DIRS = \
components \
content \
locales \
- mozapps \
+ mozapps/downloads \
+ mozapps/extensions \
+ mozapps/handling \
+ mozapps/plugins \
+ mozapps/shared \
+ mozapps/update \
+ mozapps/xpinstall \
obsolete \
profile \
spatial-navigation \
themes \
$(NULL)
+ifeq ($(OS_ARCH),WINCE)
+ifdef WINCE_WINDOWS_MOBILE
+DIRS += mozapps/readstrings
+DIRS += mozapps/installer/wince
+endif
+endif
+
ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
PARALLEL_DIRS += system/unixproxy
endif
ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
PARALLEL_DIRS += system/osxproxy
endif
--- a/toolkit/components/alerts/Makefile.in
+++ b/toolkit/components/alerts/Makefile.in
@@ -31,35 +31,51 @@
# 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 = ../../..
+DEPTH = ../../..
topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS = public
+MODULE = alerts
+XPIDLSRCS = nsIAlertsService.idl
ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2 qt android))
-DIRS += src
+LIBRARY_NAME = alerts_s
+FORCE_STATIC_LIB = 1
+LIBXUL_LIBRARY = 1
+CPPSRCS = \
+ nsAlertsService.cpp \
+ $(NULL)
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
endif
ifneq (,$(filter cocoa, $(MOZ_WIDGET_TOOLKIT)))
-# src/mac/growl needs to be first for linking to work!
+XPIDLSRCS += nsINotificationsList.idl
+# mac/growl needs to be first for linking to work!
DIRS += \
- src/mac/growl \
- src/mac \
+ mac/growl \
+ mac \
$(NULL)
endif
ifdef ENABLE_TESTS
-DIRS += test
+DIRS += test
+endif
+
+ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2 qt android))
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/ipc/chromium/chromium-config.mk
endif
include $(topsrcdir)/config/rules.mk
+ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2 qt android))
+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+endif
rename from toolkit/components/alerts/src/mac/Makefile.in
rename to toolkit/components/alerts/mac/Makefile.in
--- a/toolkit/components/alerts/src/mac/Makefile.in
+++ b/toolkit/components/alerts/mac/Makefile.in
@@ -29,29 +29,28 @@
# 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 = ../../../../..
+DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = alerts
LIBRARY_NAME = alerts_s
IS_COMPONENT = 1
FORCE_SHARED_LIB = 1
-
CMMSRCS = \
nsAlertsService.mm \
mozGrowlDelegate.mm \
nsAlertsImageLoadListener.mm \
nsNotificationsList.mm \
$(NULL)
CPPSRCS = \
rename from toolkit/components/alerts/src/mac/growl/CFGrowlAdditions.c
rename to toolkit/components/alerts/mac/growl/CFGrowlAdditions.c
rename from toolkit/components/alerts/src/mac/growl/CFGrowlAdditions.h
rename to toolkit/components/alerts/mac/growl/CFGrowlAdditions.h
rename from toolkit/components/alerts/src/mac/growl/CFGrowlDefines.h
rename to toolkit/components/alerts/mac/growl/CFGrowlDefines.h
rename from toolkit/components/alerts/src/mac/growl/CFMutableDictionaryAdditions.c
rename to toolkit/components/alerts/mac/growl/CFMutableDictionaryAdditions.c
rename from toolkit/components/alerts/src/mac/growl/CFMutableDictionaryAdditions.h
rename to toolkit/components/alerts/mac/growl/CFMutableDictionaryAdditions.h
rename from toolkit/components/alerts/src/mac/growl/CFURLAdditions.c
rename to toolkit/components/alerts/mac/growl/CFURLAdditions.c
rename from toolkit/components/alerts/src/mac/growl/CFURLAdditions.h
rename to toolkit/components/alerts/mac/growl/CFURLAdditions.h
rename from toolkit/components/alerts/src/mac/growl/GrowlAbstractSingletonObject.h
rename to toolkit/components/alerts/mac/growl/GrowlAbstractSingletonObject.h
rename from toolkit/components/alerts/src/mac/growl/GrowlApplicationBridge.h
rename to toolkit/components/alerts/mac/growl/GrowlApplicationBridge.h
rename from toolkit/components/alerts/src/mac/growl/GrowlApplicationBridge.m
rename to toolkit/components/alerts/mac/growl/GrowlApplicationBridge.m
rename from toolkit/components/alerts/src/mac/growl/GrowlDefines.h
rename to toolkit/components/alerts/mac/growl/GrowlDefines.h
rename from toolkit/components/alerts/src/mac/growl/GrowlDefinesInternal.h
rename to toolkit/components/alerts/mac/growl/GrowlDefinesInternal.h
rename from toolkit/components/alerts/src/mac/growl/GrowlPathUtilities.h
rename to toolkit/components/alerts/mac/growl/GrowlPathUtilities.h
rename from toolkit/components/alerts/src/mac/growl/GrowlPathUtilities.m
rename to toolkit/components/alerts/mac/growl/GrowlPathUtilities.m
rename from toolkit/components/alerts/src/mac/growl/GrowlPathway.h
rename to toolkit/components/alerts/mac/growl/GrowlPathway.h
rename from toolkit/components/alerts/src/mac/growl/GrowlPreferencesController.h
rename to toolkit/components/alerts/mac/growl/GrowlPreferencesController.h
rename from toolkit/components/alerts/src/mac/growl/GrowlTicketController.h
rename to toolkit/components/alerts/mac/growl/GrowlTicketController.h
rename from toolkit/components/alerts/src/mac/growl/Makefile.in
rename to toolkit/components/alerts/mac/growl/Makefile.in
--- a/toolkit/components/alerts/src/mac/growl/Makefile.in
+++ b/toolkit/components/alerts/mac/growl/Makefile.in
@@ -29,17 +29,17 @@
# 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 = ../../../../../..
+DEPTH = ../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = alerts
LIBRARY_NAME = growl_s
rename from toolkit/components/alerts/src/mac/growl/license.txt
rename to toolkit/components/alerts/mac/growl/license.txt
rename from toolkit/components/alerts/src/mac/mozGrowlDelegate.h
rename to toolkit/components/alerts/mac/mozGrowlDelegate.h
rename from toolkit/components/alerts/src/mac/mozGrowlDelegate.mm
rename to toolkit/components/alerts/mac/mozGrowlDelegate.mm
rename from toolkit/components/alerts/src/mac/nsAlertsImageLoadListener.h
rename to toolkit/components/alerts/mac/nsAlertsImageLoadListener.h
rename from toolkit/components/alerts/src/mac/nsAlertsImageLoadListener.mm
rename to toolkit/components/alerts/mac/nsAlertsImageLoadListener.mm
rename from toolkit/components/alerts/src/mac/nsAlertsService.h
rename to toolkit/components/alerts/mac/nsAlertsService.h
rename from toolkit/components/alerts/src/mac/nsAlertsService.mm
rename to toolkit/components/alerts/mac/nsAlertsService.mm
rename from toolkit/components/alerts/src/mac/nsAlertsServiceModule.cpp
rename to toolkit/components/alerts/mac/nsAlertsServiceModule.cpp
rename from toolkit/components/alerts/src/mac/nsNotificationsList.h
rename to toolkit/components/alerts/mac/nsNotificationsList.h
rename from toolkit/components/alerts/src/mac/nsNotificationsList.mm
rename to toolkit/components/alerts/mac/nsNotificationsList.mm
rename from toolkit/components/alerts/src/nsAlertsService.cpp
rename to toolkit/components/alerts/nsAlertsService.cpp
rename from toolkit/components/alerts/src/nsAlertsService.h
rename to toolkit/components/alerts/nsAlertsService.h
rename from toolkit/components/alerts/public/nsIAlertsService.idl
rename to toolkit/components/alerts/nsIAlertsService.idl
rename from toolkit/components/alerts/public/nsINotificationsList.idl
rename to toolkit/components/alerts/nsINotificationsList.idl
deleted file mode 100644
--- a/toolkit/components/alerts/public/Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 = alerts
-XPIDL_MODULE=alerts
-
-XPIDLSRCS = nsIAlertsService.idl
-
-ifneq (,$(filter cocoa, $(MOZ_WIDGET_TOOLKIT)))
-XPIDLSRCS += nsINotificationsList.idl
-endif
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/toolkit/components/alerts/src/Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#! gmake
-#
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 = alerts
-LIBRARY_NAME = alerts_s
-FORCE_STATIC_LIB = 1
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS = \
- nsAlertsService.cpp \
- $(NULL)
-
-LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
-
-include $(topsrcdir)/config/config.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
-include $(topsrcdir)/config/rules.mk
-
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
--- a/toolkit/components/autocomplete/Makefile.in
+++ b/toolkit/components/autocomplete/Makefile.in
@@ -1,14 +1,76 @@
-DEPTH = ../../..
+# ***** 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 mozilla.org Code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Joe Hewitt <hewitt@netscape.com>
+#
+# 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@
+srcdir = @srcdir@
+VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS = public src
+MODULE = autocomplete
+MODULE_NAME = tkAutoCompleteModule
+LIBRARY_NAME = tkautocomplete
+SHORT_LIBNAME = tkautoc
+IS_COMPONENT = 1
+EXPORT_LIBRARY = 1
+LIBXUL_LIBRARY = 1
+
+XPIDLSRCS = \
+ nsIAutoCompleteController.idl \
+ nsIAutoCompleteInput.idl \
+ nsIAutoCompletePopup.idl \
+ nsIAutoCompleteResult.idl \
+ nsIAutoCompleteSearch.idl \
+ nsIAutoCompleteSimpleResult.idl \
+ $(NULL)
+
+CPPSRCS = \
+ nsAutoCompleteController.cpp \
+ nsAutoCompleteSimpleResult.cpp \
+ $(NULL)
+
+EXTRA_DSO_LDOPTS += \
+ $(MOZ_UNICHARUTIL_LIBS) \
+ $(MOZ_COMPONENT_LIBS) \
+ $(NULL)
ifdef ENABLE_TESTS
DIRS += tests
endif
include $(topsrcdir)/config/rules.mk
rename from toolkit/components/autocomplete/src/nsAutoCompleteController.cpp
rename to toolkit/components/autocomplete/nsAutoCompleteController.cpp
rename from toolkit/components/autocomplete/src/nsAutoCompleteController.h
rename to toolkit/components/autocomplete/nsAutoCompleteController.h
rename from toolkit/components/autocomplete/src/nsAutoCompleteSimpleResult.cpp
rename to toolkit/components/autocomplete/nsAutoCompleteSimpleResult.cpp
rename from toolkit/components/autocomplete/src/nsAutoCompleteSimpleResult.h
rename to toolkit/components/autocomplete/nsAutoCompleteSimpleResult.h
rename from toolkit/components/autocomplete/public/nsIAutoCompleteController.idl
rename to toolkit/components/autocomplete/nsIAutoCompleteController.idl
rename from toolkit/components/autocomplete/public/nsIAutoCompleteInput.idl
rename to toolkit/components/autocomplete/nsIAutoCompleteInput.idl
rename from toolkit/components/autocomplete/public/nsIAutoCompletePopup.idl
rename to toolkit/components/autocomplete/nsIAutoCompletePopup.idl
rename from toolkit/components/autocomplete/public/nsIAutoCompleteResult.idl
rename to toolkit/components/autocomplete/nsIAutoCompleteResult.idl
rename from toolkit/components/autocomplete/public/nsIAutoCompleteSearch.idl
rename to toolkit/components/autocomplete/nsIAutoCompleteSearch.idl
rename from toolkit/components/autocomplete/public/nsIAutoCompleteSimpleResult.idl
rename to toolkit/components/autocomplete/nsIAutoCompleteSimpleResult.idl
deleted file mode 100644
--- a/toolkit/components/autocomplete/public/Makefile.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# ***** 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 mozilla.org Code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Joe Hewitt <hewitt@netscape.com> (Original Author)
-#
-# 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 = autocomplete
-XPIDL_MODULE = autocomplete
-
-XPIDLSRCS = nsIAutoCompleteController.idl \
- nsIAutoCompleteInput.idl \
- nsIAutoCompletePopup.idl \
- nsIAutoCompleteSearch.idl \
- nsIAutoCompleteResult.idl \
- nsIAutoCompleteSimpleResult.idl \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/components/autocomplete/src/Makefile.in
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# ***** 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 mozilla.org Code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Joe Hewitt <hewitt@netscape.com> (Original Author)
-#
-# 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 = autocomplete
-MODULE_NAME = tkAutoCompleteModule
-LIBRARY_NAME = tkautocomplete
-SHORT_LIBNAME = tkautoc
-IS_COMPONENT = 1
-EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS = nsAutoCompleteController.cpp \
- nsAutoCompleteSimpleResult.cpp \
- $(NULL)
-
-EXTRA_DSO_LDOPTS += \
- $(MOZ_UNICHARUTIL_LIBS) \
- $(MOZ_COMPONENT_LIBS) \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -50,102 +50,100 @@ IS_COMPONENT = 1
MODULE_NAME = nsToolkitCompsModule
LIBXUL_LIBRARY = 1
ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),windows gtk2 qt android))
ALERTS_SERVICE=1
DEFINES += -DALERTS_SERVICE
endif
-
-
EXPORTS = nsToolkitCompsCID.h
CPPSRCS = nsToolkitCompsModule.cpp
include $(topsrcdir)/config/config.mk
LOCAL_INCLUDES = \
- -I$(srcdir)/../downloads/src \
- -I$(srcdir)/../feeds/src \
- -I$(srcdir)/../find/src \
- -I$(srcdir)/../intl \
- -I$(srcdir)/../startup/src \
- -I$(srcdir)/../statusfilter \
- -I$(srcdir)/../typeaheadfind/src \
- -I$(srcdir)/../url-classifier/src \
- $(NULL)
+ -I$(srcdir)/../downloads \
+ -I$(srcdir)/../feeds \
+ -I$(srcdir)/../find \
+ -I$(srcdir)/../intl \
+ -I$(srcdir)/../startup \
+ -I$(srcdir)/../statusfilter \
+ -I$(srcdir)/../typeaheadfind \
+ -I$(srcdir)/../url-classifier \
+ $(NULL)
ifdef ALERTS_SERVICE
LOCAL_INCLUDES += \
- -I$(srcdir)/../alerts/src \
- $(NULL)
+ -I$(srcdir)/../alerts \
+ $(NULL)
endif
ifeq (Android,$(OS_TARGET))
LOCAL_INCLUDES += \
- -I$(srcdir)/../webapps \
- $(NULL)
+ -I$(srcdir)/../webapps \
+ $(NULL)
endif
SHARED_LIBRARY_LIBS = \
- ../find/src/$(LIB_PREFIX)mozfind_s.$(LIB_SUFFIX) \
- ../typeaheadfind/src/$(LIB_PREFIX)fastfind_s.$(LIB_SUFFIX) \
- ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
- ../statusfilter/$(LIB_PREFIX)mozbrwsr_s.$(LIB_SUFFIX) \
- $(NULL)
+ ../find/$(LIB_PREFIX)mozfind_s.$(LIB_SUFFIX) \
+ ../typeaheadfind/$(LIB_PREFIX)fastfind_s.$(LIB_SUFFIX) \
+ ../startup/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
+ ../statusfilter/$(LIB_PREFIX)mozbrwsr_s.$(LIB_SUFFIX) \
+ $(NULL)
ifndef MOZ_DISABLE_PARENTAL_CONTROLS
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-SHARED_LIBRARY_LIBS += ../parentalcontrols/src/$(LIB_PREFIX)parentalcontrols_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../parentalcontrols/$(LIB_PREFIX)parentalcontrols_s.$(LIB_SUFFIX)
LOCAL_INCLUDES += \
- -I$(srcdir)/../parentalcontrols/src \
- $(NULL)
+ -I$(srcdir)/../parentalcontrols \
+ $(NULL)
endif
endif
ifdef MOZ_RDF
SHARED_LIBRARY_LIBS += \
- ../downloads/src/$(LIB_PREFIX)download_s.$(LIB_SUFFIX) \
+ ../downloads/$(LIB_PREFIX)download_s.$(LIB_SUFFIX) \
../intl/$(LIB_PREFIX)intl_s.$(LIB_SUFFIX) \
$(NULL)
endif
ifdef ALERTS_SERVICE
-SHARED_LIBRARY_LIBS += ../alerts/src/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../alerts/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
endif
ifdef ALERTS_SERVICE_MAC
-SHARED_LIBRARY_LIBS += ../alerts/src/mac/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
-SHARED_LIBRARY_LIBS += ../alerts/src/mac/growl/$(LIB_PREFIX)growl_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../alerts/mac/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../alerts/mac/growl/$(LIB_PREFIX)growl_s.$(LIB_SUFFIX)
endif
ifdef MOZ_URL_CLASSIFIER
-SHARED_LIBRARY_LIBS += ../url-classifier/src/$(LIB_PREFIX)urlclassifier_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../url-classifier/$(LIB_PREFIX)urlclassifier_s.$(LIB_SUFFIX)
EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
endif
ifdef MOZ_FEEDS
-SHARED_LIBRARY_LIBS += ../feeds/src/$(LIB_PREFIX)feed_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../feeds/$(LIB_PREFIX)feed_s.$(LIB_SUFFIX)
endif
ifeq (Android,$(OS_TARGET))
SHARED_LIBRARY_LIBS += ../webapps/$(LIB_PREFIX)webapps_s.$(LIB_SUFFIX)
endif
EXTRA_DSO_LIBS = gkgfx
EXTRA_DSO_LDOPTS += \
- $(LIBS_DIR) \
- $(EXTRA_DSO_LIBS) \
- $(MOZ_UNICHARUTIL_LIBS) \
- $(MOZ_COMPONENT_LIBS) \
- $(MOZ_JS_LIBS) \
- $(NULL)
+ $(LIBS_DIR) \
+ $(EXTRA_DSO_LIBS) \
+ $(MOZ_UNICHARUTIL_LIBS) \
+ $(MOZ_COMPONENT_LIBS) \
+ $(MOZ_JS_LIBS) \
+ $(NULL)
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif
ifeq ($(OS_ARCH),WINNT)
-OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32)
+OS_LIBS += $(call EXPAND_LIBNAME,shell32 ole32)
endif
include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/commandlines/Makefile.in
+++ b/toolkit/components/commandlines/Makefile.in
@@ -37,18 +37,42 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS = \
- public \
- src \
- $(NULL)
+MODULE = toolkitcomps
+XPIDL_MODULE = commandlines
+LIBRARY_NAME = commandlines
+SHORT_LIBNAME = cmdlines
+EXPORT_LIBRARY = 1
+IS_COMPONENT = 1
+MODULE_NAME = CommandLineModule
+LIBXUL_LIBRARY = 1
+
+XPIDLSRCS = \
+ nsICommandLine.idl \
+ nsICommandLineHandler.idl \
+ nsICommandLineRunner.idl \
+ nsICommandLineValidator.idl \
+ $(NULL)
+
+CPPSRCS = \
+ nsCommandLine.cpp \
+ $(NULL)
+
+EXTRA_DSO_LDOPTS += \
+ $(MOZ_UNICHARUTIL_LIBS) \
+ $(MOZ_COMPONENT_LIBS) \
+ $(NULL)
+
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+EXTRA_DSO_LDOPTS += $(TK_LIBS)
+endif
ifdef ENABLE_TESTS
DIRS += test
endif
include $(topsrcdir)/config/rules.mk
rename from toolkit/components/commandlines/src/nsCommandLine.cpp
rename to toolkit/components/commandlines/nsCommandLine.cpp
rename from toolkit/components/commandlines/public/nsICommandLine.idl
rename to toolkit/components/commandlines/nsICommandLine.idl
rename from toolkit/components/commandlines/public/nsICommandLineHandler.idl
rename to toolkit/components/commandlines/nsICommandLineHandler.idl
rename from toolkit/components/commandlines/public/nsICommandLineRunner.idl
rename to toolkit/components/commandlines/nsICommandLineRunner.idl
rename from toolkit/components/commandlines/public/nsICommandLineValidator.idl
rename to toolkit/components/commandlines/nsICommandLineValidator.idl
deleted file mode 100644
--- a/toolkit/components/commandlines/public/Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
-# ***** 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 toolkit.
-#
-# The Initial Developer of the Original Code is
-# Benjamin Smedberg <benjamin@smedbergs.us>.
-#
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 = toolkitcomps
-XPIDL_MODULE = commandlines
-
-XPIDLSRCS = \
- nsICommandLine.idl \
- nsICommandLineRunner.idl \
- nsICommandLineHandler.idl \
- nsICommandLineValidator.idl \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/components/commandlines/src/Makefile.in
+++ /dev/null
@@ -1,70 +0,0 @@
-# ***** 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 toolkit.
-#
-# The Initial Developer of the Original Code is
-# Benjamin Smedberg <benjamin@smedbergs.us>.
-#
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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
-
-# Because this is used by seamonkey and the toolkit, we build this as its
-# own component, instead of building it into toolkit/components/build
-
-MODULE = toolkitcomps
-LIBRARY_NAME = commandlines
-SHORT_LIBNAME = cmdlines
-EXPORT_LIBRARY = 1
-IS_COMPONENT = 1
-MODULE_NAME = CommandLineModule
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS = \
- nsCommandLine.cpp \
- $(NULL)
-
-EXTRA_DSO_LDOPTS += \
- $(MOZ_UNICHARUTIL_LIBS) \
- $(MOZ_COMPONENT_LIBS) \
- $(NULL)
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += $(TK_LIBS)
-endif
-
-include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/contentprefs/Makefile.in
+++ b/toolkit/components/contentprefs/Makefile.in
@@ -29,22 +29,24 @@
# 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@
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS = src
+MODULE = contentprefs
+
+EXTRA_COMPONENTS = nsContentPrefService.js nsContentPrefService.manifest
ifdef ENABLE_TESTS
- DIRS += tests
+DIRS += tests
endif
include $(topsrcdir)/config/rules.mk
rename from toolkit/components/contentprefs/src/nsContentPrefService.js
rename to toolkit/components/contentprefs/nsContentPrefService.js
rename from toolkit/components/contentprefs/src/nsContentPrefService.manifest
rename to toolkit/components/contentprefs/nsContentPrefService.manifest
deleted file mode 100644
--- a/toolkit/components/contentprefs/src/Makefile.in
+++ /dev/null
@@ -1,48 +0,0 @@
-# ***** 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 Content Prefs (cpref).
-#
-# The Initial Developer of the Original Code is Mozilla.
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Myk Melez <myk@mozilla.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 = contentprefs
-
-EXTRA_COMPONENTS = nsContentPrefService.js nsContentPrefService.manifest
-
-include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/downloads/Makefile.in
+++ b/toolkit/components/downloads/Makefile.in
@@ -15,38 +15,72 @@
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 1998
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
+# Stuart Parmenter <pavlov@pavlov.net>
#
# 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 = ../../..
+DEPTH = ../../..
topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS = public src
+MODULE = downloads
+LIBRARY_NAME = download_s
+FORCE_STATIC_LIB = 1
+LIBXUL_LIBRARY = 1
+
+XPIDLSRCS = \
+ nsIDownload.idl \
+ nsIDownloadManager.idl \
+ nsIDownloadManagerUI.idl \
+ nsIDownloadProgressListener.idl \
+ $(NULL)
+
+CPPSRCS = \
+ nsDownloadManager.cpp \
+ $(NULL)
+
+ifndef GNU_CXX
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS += nsDownloadScanner.cpp
+endif
+endif
+
+# definition of MOZ_SUITE is only added via config.mk
+include $(topsrcdir)/config/config.mk
+
+ifndef MOZ_SUITE
+# XXX - Until Suite builds off XULRunner we can't guarantee our implementation
+# of nsIDownloadManagerUI overrides toolkit's.
+EXTRA_COMPONENTS = \
+ nsDownloadManagerUI.js \
+ nsDownloadManagerUI.manifest \
+ $(NULL)
+endif
ifdef ENABLE_TESTS
DIRS += test
endif
include $(topsrcdir)/config/rules.mk
+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
rename from toolkit/components/downloads/src/nsDownloadManager.cpp
rename to toolkit/components/downloads/nsDownloadManager.cpp
rename from toolkit/components/downloads/src/nsDownloadManager.h
rename to toolkit/components/downloads/nsDownloadManager.h
rename from toolkit/components/downloads/src/nsDownloadManagerUI.js
rename to toolkit/components/downloads/nsDownloadManagerUI.js
rename from toolkit/components/downloads/src/nsDownloadManagerUI.manifest
rename to toolkit/components/downloads/nsDownloadManagerUI.manifest
rename from toolkit/components/downloads/src/nsDownloadProxy.h
rename to toolkit/components/downloads/nsDownloadProxy.h
rename from toolkit/components/downloads/src/nsDownloadScanner.cpp
rename to toolkit/components/downloads/nsDownloadScanner.cpp
rename from toolkit/components/downloads/src/nsDownloadScanner.h
rename to toolkit/components/downloads/nsDownloadScanner.h
rename from toolkit/components/downloads/public/nsIDownload.idl
rename to toolkit/components/downloads/nsIDownload.idl
rename from toolkit/components/downloads/public/nsIDownloadManager.idl
rename to toolkit/components/downloads/nsIDownloadManager.idl
rename from toolkit/components/downloads/public/nsIDownloadManagerUI.idl
rename to toolkit/components/downloads/nsIDownloadManagerUI.idl
rename from toolkit/components/downloads/public/nsIDownloadProgressListener.idl
rename to toolkit/components/downloads/nsIDownloadProgressListener.idl
deleted file mode 100644
--- a/toolkit/components/downloads/public/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 = downloads
-
-XPIDLSRCS = nsIDownloadManager.idl \
- nsIDownloadProgressListener.idl \
- nsIDownload.idl \
- nsIDownloadManagerUI.idl \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/toolkit/components/downloads/src/Makefile.in
+++ /dev/null
@@ -1,78 +0,0 @@
-#! gmake
-#
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Stuart Parmenter <pavlov@netscape.com>
-#
-# 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 = downloads
-LIBRARY_NAME = download_s
-FORCE_STATIC_LIB = 1
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS = \
- nsDownloadManager.cpp \
- $(NULL)
-
-ifndef GNU_CXX
-ifeq ($(OS_ARCH),WINNT)
-CPPSRCS += nsDownloadScanner.cpp
-endif
-endif
-
-# definition of MOZ_SUITE is only added via config.mk
-include $(topsrcdir)/config/config.mk
-
-ifndef MOZ_SUITE
-# XXX - Until Suite builds off XULRunner we can't guarantee our implementation
-# of nsIDownloadManagerUI overrides toolkit's.
-EXTRA_COMPONENTS = \
- nsDownloadManagerUI.js \
- nsDownloadManagerUI.manifest \
- $(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-
rename from toolkit/components/feeds/src/FeedProcessor.js
rename to toolkit/components/feeds/FeedProcessor.js
rename from toolkit/components/feeds/src/FeedProcessor.manifest
rename to toolkit/components/feeds/FeedProcessor.manifest
--- a/toolkit/components/feeds/Makefile.in
+++ b/toolkit/components/feeds/Makefile.in
@@ -30,30 +30,57 @@
# 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@
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
include $(DEPTH)/config/autoconf.mk
-DIRS = public src
+
+MODULE = feeds
+LIBRARY_NAME = feed_s
+MOZILLA_INTERNAL_API = 1
+FORCE_STATIC_LIB = 1
+LIBXUL_LIBRARY = 1
+
+XPIDLSRCS = \
+ nsIFeed.idl \
+ nsIFeedContainer.idl \
+ nsIFeedElementBase.idl \
+ nsIFeedEntry.idl \
+ nsIFeedGenerator.idl \
+ nsIFeedListener.idl \
+ nsIFeedPerson.idl \
+ nsIFeedProcessor.idl \
+ nsIFeedResult.idl \
+ nsIFeedTextConstruct.idl \
+ nsIScriptableUnescapeHTML.idl \
+ $(NULL)
+
+CPPSRCS = \
+ nsScriptableUnescapeHTML.cpp \
+ $(NULL)
+
+EXTRA_COMPONENTS = FeedProcessor.js FeedProcessor.manifest
+
include $(topsrcdir)/config/rules.mk
ABS_SRCDIR := $(shell cd $(srcdir) && pwd)
ifeq ($(OS_ARCH),WINNT)
ABS_DEPTH := $(shell cd $(DEPTH) && pwd)
check::
- cd $(srcdir)/test; $(CYGWIN_WRAPPER) $(ABS_DEPTH)/dist/bin/xpcshell$(BIN_SUFFIX) shell.js
+ cd $(srcdir)/test; $(ABS_DEPTH)/dist/bin/xpcshell$(BIN_SUFFIX) shell.js
else
check::
$(RUN_TEST_PROGRAM) $(DIST)/bin/xpcshell$(BIN_SUFFIX) $(srcdir)/test/shell.js $(ABS_SRCDIR)/test
endif # WINNT
rename from toolkit/components/feeds/public/nsIFeed.idl
rename to toolkit/components/feeds/nsIFeed.idl
rename from toolkit/components/feeds/public/nsIFeedContainer.idl
rename to toolkit/components/feeds/nsIFeedContainer.idl
rename from toolkit/components/feeds/public/nsIFeedElementBase.idl
rename to toolkit/components/feeds/nsIFeedElementBase.idl
rename from toolkit/components/feeds/public/nsIFeedEntry.idl
rename to toolkit/components/feeds/nsIFeedEntry.idl
rename from toolkit/components/feeds/public/nsIFeedGenerator.idl
rename to toolkit/components/feeds/nsIFeedGenerator.idl
rename from toolkit/components/feeds/public/nsIFeedListener.idl
rename to toolkit/components/feeds/nsIFeedListener.idl
rename from toolkit/components/feeds/public/nsIFeedPerson.idl
rename to toolkit/components/feeds/nsIFeedPerson.idl
rename from toolkit/components/feeds/public/nsIFeedProcessor.idl
rename to toolkit/components/feeds/nsIFeedProcessor.idl
rename from toolkit/components/feeds/public/nsIFeedResult.idl
rename to toolkit/components/feeds/nsIFeedResult.idl
rename from toolkit/components/feeds/public/nsIFeedTextConstruct.idl
rename to toolkit/components/feeds/nsIFeedTextConstruct.idl
rename from toolkit/components/feeds/public/nsIScriptableUnescapeHTML.idl
rename to toolkit/components/feeds/nsIScriptableUnescapeHTML.idl
rename from toolkit/components/feeds/src/nsScriptableUnescapeHTML.cpp
rename to toolkit/components/feeds/nsScriptableUnescapeHTML.cpp
rename from toolkit/components/feeds/src/nsScriptableUnescapeHTML.h
rename to toolkit/components/feeds/nsScriptableUnescapeHTML.h
deleted file mode 100644
--- a/toolkit/components/feeds/public/Makefile.in
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 = feeds
-XPIDL_MODULE = feeds
-XPIDLSRCS = nsIFeedProcessor.idl \
- nsIFeedResult.idl \
- nsIFeedListener.idl \
- nsIFeed.idl \
- nsIFeedContainer.idl \
- nsIFeedEntry.idl \
- nsIFeedTextConstruct.idl \
- nsIScriptableUnescapeHTML.idl \
- nsIFeedElementBase.idl \
- nsIFeedGenerator.idl \
- nsIFeedPerson.idl \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/components/feeds/src/Makefile.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 = feeds
-LIBRARY_NAME = feed_s
-MOZILLA_INTERNAL_API = 1
-FORCE_STATIC_LIB = 1
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS = nsScriptableUnescapeHTML.cpp \
- $(NULL)
-
-EXTRA_COMPONENTS = FeedProcessor.js FeedProcessor.manifest
-
-include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/filepicker/Makefile.in
+++ b/toolkit/components/filepicker/Makefile.in
@@ -15,16 +15,18 @@
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 1998
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
+# Brian Ryner <bryner@brianryner.com>
+# Stuart Parmenter <pavlov@pavlov.net>
#
# 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
@@ -40,13 +42,33 @@ DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifdef MOZ_XUL
ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
-DIRS = public src
+MODULE = filepicker
+LIBRARY_NAME = fileview
+SHORT_LIBNAME = fileview
+EXPORT_LIBRARY = 1
+IS_COMPONENT = 1
+MODULE_NAME = nsFileViewModule
+LIBXUL_LIBRARY = 1
+XPIDLSRCS = \
+ nsIFileView.idl \
+ $(NULL)
+CPPSRCS = \
+ nsFileView.cpp \
+ $(NULL)
+EXTRA_COMPONENTS = nsFilePicker.js
+EXTRA_PP_COMPONENTS = nsFilePicker.manifest
endif
endif
include $(topsrcdir)/config/rules.mk
+
+ifdef MOZ_XUL
+ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+endif
+endif
rename from toolkit/components/filepicker/src/nsFilePicker.js
rename to toolkit/components/filepicker/nsFilePicker.js
rename from toolkit/components/filepicker/src/nsFilePicker.manifest
rename to toolkit/components/filepicker/nsFilePicker.manifest
rename from toolkit/components/filepicker/src/nsFileView.cpp
rename to toolkit/components/filepicker/nsFileView.cpp
rename from toolkit/components/filepicker/public/nsIFileView.idl
rename to toolkit/components/filepicker/nsIFileView.idl
deleted file mode 100644
--- a/toolkit/components/filepicker/public/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-#! gmake
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Brian Ryner <bryner@brianryner.com>
-#
-# 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 = filepicker
-XPIDL_MODULE = filepicker
-
-XPIDLSRCS = nsIFileView.idl
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/toolkit/components/filepicker/src/Makefile.in
+++ /dev/null
@@ -1,65 +0,0 @@
-#! gmake
-#
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Stuart Parmenter <pavlov@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of 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 = filepicker
-LIBRARY_NAME = fileview
-SHORT_LIBNAME = fileview
-EXPORT_LIBRARY = 1
-IS_COMPONENT = 1
-MODULE_NAME = nsFileViewModule
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS = \
- nsFileView.cpp \
- $(NULL)
-
-EXTRA_COMPONENTS = nsFilePicker.js
-EXTRA_PP_COMPONENTS = nsFilePicker.manifest
-
-include $(topsrcdir)/config/rules.mk
-
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
--- a/toolkit/components/find/Makefile.in
+++ b/toolkit/components/find/Makefile.in
@@ -30,19 +30,29 @@
# 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@
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS = public src
+MODULE = mozfind
+LIBRARY_NAME = mozfind_s
+FORCE_STATIC_LIB = 1
+LIBXUL_LIBRARY = 1
+
+XPIDLSRCS = \
+ nsIFindService.idl \
+ $(NULL)
+
+CPPSRCS = \
+ nsFindService.cpp \
+ $(NULL)
include $(topsrcdir)/config/rules.mk
-
rename from toolkit/components/find/src/nsFindService.cpp
rename to toolkit/components/find/nsFindService.cpp
rename from toolkit/components/find/src/nsFindService.h
rename to toolkit/components/find/nsFindService.h
rename from toolkit/components/find/public/nsIFindService.idl
rename to toolkit/components/find/nsIFindService.idl
deleted file mode 100644
--- a/toolkit/components/find/public/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of 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 = mozfind
-XPIDL_MODULE = mozfind
-
-XPIDLSRCS = \
- nsIFindService.idl \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/components/find/src/Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of 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 = mozfind
-LIBRARY_NAME = mozfind_s
-FORCE_STATIC_LIB = 1
-LIBXUL_LIBRARY = 1
-
-CPPSRCS = \
- nsFindService.cpp \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
--- a/toolkit/components/microformats/Makefile.in
+++ b/toolkit/components/microformats/Makefile.in
@@ -36,16 +36,17 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS = src
+MODULE = microformats
+
+EXTRA_JS_MODULES = Microformats.js
ifdef ENABLE_TESTS
DIRS += tests
endif
include $(topsrcdir)/config/rules.mk
-
rename from toolkit/components/microformats/src/Microformats.js
rename to toolkit/components/microformats/Microformats.js
deleted file mode 100644
--- a/toolkit/components/microformats/src/Makefile.in
+++ /dev/null
@@ -1,48 +0,0 @@
-# ***** 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 Microformats.
-#
-# The Initial Developer of the Original Code IBM Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2007
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mike Kaply
-#
-# 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 = microformats
-
-EXTRA_JS_MODULES = Microformats.js
-
-include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/parentalcontrols/Makefile.in
+++ b/toolkit/components/parentalcontrols/Makefile.in
@@ -30,26 +30,33 @@
# 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
-DIRS = public
+MODULE = parentalcontrols
+
+XPIDLSRCS = \
+ nsIParentalControlsService.idl \
+ $(NULL)
ifndef MOZ_DISABLE_PARENTAL_CONTROLS
ifeq (WINNT,$(OS_ARCH))
-DIRS += src
+LIBRARY_NAME = parentalcontrols_s
+FORCE_STATIC_LIB = 1
+LIBXUL_LIBRARY = 1
+CPPSRCS = \
+ nsParentalControlsServiceWin.cpp \
+ $(NULL)
endif
endif
include $(topsrcdir)/config/rules.mk
-
rename from toolkit/components/parentalcontrols/public/nsIParentalControlsService.idl
rename to toolkit/components/parentalcontrols/nsIParentalControlsService.idl
rename from toolkit/components/parentalcontrols/src/nsParentalControlsServiceWin.cpp
rename to toolkit/components/parentalcontrols/nsParentalControlsServiceWin.cpp
rename from toolkit/components/parentalcontrols/src/nsParentalControlsServiceWin.h
rename to toolkit/components/parentalcontrols/nsParentalControlsServiceWin.h
deleted file mode 100644
--- a/toolkit/components/parentalcontrols/public/Makefile.in
+++ /dev/null
@@ -1,51 +0,0 @@
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Mozilla Foundation.
-# Portions created by the Initial Developer are Copyright (C) 2008
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 = parentalcontrols
-XPIDL_MODULE = parentalcontrols
-
-XPIDLSRCS = \
- nsIParentalControlsService.idl \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/components/parentalcontrols/src/Makefile.in
+++ /dev/null
@@ -1,57 +0,0 @@
-#! gmake
-#
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Mozilla Foundation.
-# Portions created by the Initial Developer are Copyright (C) 2008
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 = parentalcontrols
-LIBRARY_NAME = parentalcontrols_s
-FORCE_STATIC_LIB = 1
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS = \
- nsParentalControlsServiceWin.cpp \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/passwordmgr/Makefile.in
+++ b/toolkit/components/passwordmgr/Makefile.in
@@ -31,22 +31,44 @@
# 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@
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS = public src content
+MODULE = loginmgr
+
+XPIDLSRCS = \
+ nsILoginInfo.idl \
+ nsILoginManager.idl \
+ nsILoginManagerCrypto.idl \
+ nsILoginManagerIEMigrationHelper.idl \
+ nsILoginManagerPrompter.idl \
+ nsILoginManagerStorage.idl \
+ nsILoginMetaInfo.idl \
+ $(NULL)
+
+EXTRA_COMPONENTS = \
+ crypto-SDR.js \
+ nsLoginInfo.js \
+ nsLoginManager.js \
+ nsLoginManagerPrompter.js \
+ passwordmgr.manifest \
+ storage-Legacy.js \
+ storage-mozStorage.js \
+ $(NULL)
+
+DIRS = content
ifdef ENABLE_TESTS
-DIRS += test
+DIRS += test
endif
include $(topsrcdir)/config/rules.mk
rename from toolkit/components/passwordmgr/src/crypto-SDR.js
rename to toolkit/components/passwordmgr/crypto-SDR.js
rename from toolkit/components/passwordmgr/public/nsILoginInfo.idl
rename to toolkit/components/passwordmgr/nsILoginInfo.idl
rename from toolkit/components/passwordmgr/public/nsILoginManager.idl
rename to toolkit/components/passwordmgr/nsILoginManager.idl
rename from toolkit/components/passwordmgr/public/nsILoginManagerCrypto.idl
rename to toolkit/components/passwordmgr/nsILoginManagerCrypto.idl
rename from toolkit/components/passwordmgr/public/nsILoginManagerIEMigrationHelper.idl
rename to toolkit/components/passwordmgr/nsILoginManagerIEMigrationHelper.idl
rename from toolkit/components/passwordmgr/public/nsILoginManagerPrompter.idl
rename to toolkit/components/passwordmgr/nsILoginManagerPrompter.idl
rename from toolkit/components/passwordmgr/public/nsILoginManagerStorage.idl
rename to toolkit/components/passwordmgr/nsILoginManagerStorage.idl
rename from toolkit/components/passwordmgr/public/nsILoginMetaInfo.idl
rename to toolkit/components/passwordmgr/nsILoginMetaInfo.idl
rename from toolkit/components/passwordmgr/src/nsLoginInfo.js
rename to toolkit/components/passwordmgr/nsLoginInfo.js
rename from toolkit/components/passwordmgr/src/nsLoginManager.js
rename to toolkit/components/passwordmgr/nsLoginManager.js
rename from toolkit/components/passwordmgr/src/nsLoginManagerPrompter.js
rename to toolkit/components/passwordmgr/nsLoginManagerPrompter.js
rename from toolkit/components/passwordmgr/src/passwordmgr.manifest
rename to toolkit/components/passwordmgr/passwordmgr.manifest
deleted file mode 100644
--- a/toolkit/components/passwordmgr/public/Makefile.in
+++ /dev/null
@@ -1,57 +0,0 @@
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is Mozilla Foundation.
-# Portions created by the Initial Developer are Copyright (C) 2007
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Justin Dolske <dolske@mozilla.com> (original author)
-#
-# 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 = loginmgr
-XPIDL_MODULE = loginmgr
-
-XPIDLSRCS = \
- nsILoginInfo.idl \
- nsILoginMetaInfo.idl \
- nsILoginManager.idl \
- nsILoginManagerStorage.idl \
- nsILoginManagerPrompter.idl \
- nsILoginManagerIEMigrationHelper.idl \
- nsILoginManagerCrypto.idl \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/components/passwordmgr/src/Makefile.in
+++ /dev/null
@@ -1,56 +0,0 @@
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is Mozilla Foundation.
-# Portions created by the Initial Developer are Copyright (C) 2007
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Justin Dolske <dolske@mozilla.com> (original author)
-#
-# 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 = loginmgr
-
-EXTRA_COMPONENTS = \
- passwordmgr.manifest \
- nsLoginManager.js \
- nsLoginManagerPrompter.js \
- nsLoginInfo.js \
- storage-Legacy.js \
- storage-mozStorage.js \
- crypto-SDR.js \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
rename from toolkit/components/passwordmgr/src/storage-Legacy.js
rename to toolkit/components/passwordmgr/storage-Legacy.js
rename from toolkit/components/passwordmgr/src/storage-mozStorage.js
rename to toolkit/components/passwordmgr/storage-mozStorage.js
rename from toolkit/components/places/src/AsyncFaviconHelpers.cpp
rename to toolkit/components/places/AsyncFaviconHelpers.cpp
rename from toolkit/components/places/src/AsyncFaviconHelpers.h
rename to toolkit/components/places/AsyncFaviconHelpers.h
rename from toolkit/components/places/src/Helpers.cpp
rename to toolkit/components/places/Helpers.cpp
rename from toolkit/components/places/src/Helpers.h
rename to toolkit/components/places/Helpers.h
rename from toolkit/components/places/src/History.cpp
rename to toolkit/components/places/History.cpp
rename from toolkit/components/places/src/History.h
rename to toolkit/components/places/History.h
--- a/toolkit/components/places/Makefile.in
+++ b/toolkit/components/places/Makefile.in
@@ -31,26 +31,119 @@
# 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@
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS = public
+MODULE = places
+
+XPIDLSRCS = \
+ nsINavHistoryService.idl \
+ $(NULL)
ifdef MOZ_PLACES
-DIRS += src
+LIBRARY_NAME = places
+LIBXUL_LIBRARY = 1
+EXPORT_LIBRARY = 1
+MODULE_NAME = nsPlacesModule
+IS_COMPONENT = 1
+
+XPIDLSRCS += \
+ mozIAsyncHistory.idl \
+ mozIPlacesAutoComplete.idl \
+ nsIAnnotationService.idl \
+ nsIBrowserHistory.idl \
+ nsIDynamicContainer.idl \
+ nsIFaviconService.idl \
+ nsILivemarkService.idl \
+ nsIMicrosummaryService.idl \
+ nsINavBookmarksService.idl \
+ nsIPlacesImportExportService.idl \
+ nsITaggingService.idl \
+ nsPIPlacesDatabase.idl \
+ nsPIPlacesHistoryListenersNotifier.idl \
+ $(NULL)
+
+EXPORTS_NAMESPACES = mozilla/places
+
+EXPORTS_mozilla/places = \
+ History.h \
+ $(NULL)
+
+CPPSRCS = \
+ nsAnnoProtocolHandler.cpp \
+ nsAnnotationService.cpp \
+ nsFaviconService.cpp \
+ nsNavHistory.cpp \
+ nsNavHistoryQuery.cpp \
+ nsNavHistoryResult.cpp \
+ nsNavBookmarks.cpp \
+ nsMaybeWeakPtr.cpp \
+ nsMorkHistoryImporter.cpp \
+ nsPlacesModule.cpp \
+ SQLFunctions.cpp \
+ Helpers.cpp \
+ History.cpp \
+ nsPlacesImportExportService.cpp \
+ AsyncFaviconHelpers.cpp \
+ PlaceInfo.cpp \
+ VisitInfo.cpp \
+ $(NULL)
+
+EXTRA_DSO_LDOPTS += \
+ $(DEPTH)/db/morkreader/$(LIB_PREFIX)morkreader_s.$(LIB_SUFFIX) \
+ $(MOZ_UNICHARUTIL_LIBS) \
+ $(MOZ_COMPONENT_LIBS) \
+ $(NULL)
+
+ifndef MOZ_ENABLE_LIBXUL
+EXTRA_DSO_LDOPTS += \
+ $(MOZ_JS_LIBS) \
+ $(NULL)
+endif
+
+LOCAL_INCLUDES += -I$(srcdir)/../build
+
+# This is the default value. Must be in sync with the one defined in SQLite.
+DEFINES += -DSQLITE_DEFAULT_PAGE_SIZE=32768
+
+EXTRA_COMPONENTS = \
+ toolkitplaces.manifest \
+ nsLivemarkService.js \
+ nsTaggingService.js \
+ nsPlacesExpiration.js \
+ nsMicrosummaryService.js \
+ PlacesCategoriesStarter.js \
+ $(NULL)
+
+ifdef MOZ_XUL
+EXTRA_COMPONENTS += nsPlacesAutoComplete.js nsPlacesAutoComplete.manifest
+endif
+
+EXTRA_JS_MODULES = \
+ PlacesDBUtils.jsm \
+ utils.js \
+ $(NULL)
+
+EXTRA_PP_JS_MODULES = \
+ PlacesUtils.jsm \
+ $(NULL)
ifdef ENABLE_TESTS
- DIRS += tests
+DIRS += tests
endif
+
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/ipc/chromium/chromium-config.mk
+
endif
include $(topsrcdir)/config/rules.mk
rename from toolkit/components/places/src/PlaceInfo.cpp
rename to toolkit/components/places/PlaceInfo.cpp
rename from toolkit/components/places/src/PlaceInfo.h
rename to toolkit/components/places/PlaceInfo.h
rename from toolkit/components/places/src/PlacesCategoriesStarter.js
rename to toolkit/components/places/PlacesCategoriesStarter.js
rename from toolkit/components/places/src/PlacesDBUtils.jsm
rename to toolkit/components/places/PlacesDBUtils.jsm
rename from toolkit/components/places/src/PlacesUtils.jsm
rename to toolkit/components/places/PlacesUtils.jsm
rename from toolkit/components/places/src/SQLFunctions.cpp
rename to toolkit/components/places/SQLFunctions.cpp
rename from toolkit/components/places/src/SQLFunctions.h
rename to toolkit/components/places/SQLFunctions.h
rename from toolkit/components/places/src/VisitInfo.cpp
rename to toolkit/components/places/VisitInfo.cpp
rename from toolkit/components/places/src/VisitInfo.h
rename to toolkit/components/places/VisitInfo.h
rename from toolkit/components/places/public/mozIAsyncHistory.idl
rename to toolkit/components/places/mozIAsyncHistory.idl
rename from toolkit/components/places/public/mozIPlacesAutoComplete.idl
rename to toolkit/components/places/mozIPlacesAutoComplete.idl
rename from toolkit/components/places/src/nsAnnoProtocolHandler.cpp
rename to toolkit/components/places/nsAnnoProtocolHandler.cpp
rename from toolkit/components/places/src/nsAnnoProtocolHandler.h
rename to toolkit/components/places/nsAnnoProtocolHandler.h
rename from toolkit/components/places/src/nsAnnotationService.cpp
rename to toolkit/components/places/nsAnnotationService.cpp
rename from toolkit/components/places/src/nsAnnotationService.h
rename to toolkit/components/places/nsAnnotationService.h
rename from toolkit/components/places/src/nsFaviconService.cpp
rename to toolkit/components/places/nsFaviconService.cpp
rename from toolkit/components/places/src/nsFaviconService.h
rename to toolkit/components/places/nsFaviconService.h
rename from toolkit/components/places/public/nsIAnnotationService.idl
rename to toolkit/components/places/nsIAnnotationService.idl
rename from toolkit/components/places/public/nsIBrowserHistory.idl
rename to toolkit/components/places/nsIBrowserHistory.idl
rename from toolkit/components/places/public/nsIDynamicContainer.idl
rename to toolkit/components/places/nsIDynamicContainer.idl
rename from toolkit/components/places/public/nsIFaviconService.idl
rename to toolkit/components/places/nsIFaviconService.idl
rename from toolkit/components/places/public/nsILivemarkService.idl
rename to toolkit/components/places/nsILivemarkService.idl
rename from toolkit/components/places/public/nsIMicrosummaryService.idl
rename to toolkit/components/places/nsIMicrosummaryService.idl
rename from toolkit/components/places/public/nsINavBookmarksService.idl
rename to toolkit/components/places/nsINavBookmarksService.idl
rename from toolkit/components/places/public/nsINavHistoryService.idl
rename to toolkit/components/places/nsINavHistoryService.idl
rename from toolkit/components/places/public/nsIPlacesImportExportService.idl
rename to toolkit/components/places/nsIPlacesImportExportService.idl
rename from toolkit/components/places/public/nsITaggingService.idl
rename to toolkit/components/places/nsITaggingService.idl
rename from toolkit/components/places/src/nsLivemarkService.js
rename to toolkit/components/places/nsLivemarkService.js
rename from toolkit/components/places/src/nsMaybeWeakPtr.cpp
rename to toolkit/components/places/nsMaybeWeakPtr.cpp
rename from toolkit/components/places/src/nsMaybeWeakPtr.h
rename to toolkit/components/places/nsMaybeWeakPtr.h
rename from toolkit/components/places/src/nsMicrosummaryService.js
rename to toolkit/components/places/nsMicrosummaryService.js
rename from toolkit/components/places/src/nsMorkHistoryImporter.cpp
rename to toolkit/components/places/nsMorkHistoryImporter.cpp
rename from toolkit/components/places/src/nsNavBookmarks.cpp
rename to toolkit/components/places/nsNavBookmarks.cpp
rename from toolkit/components/places/src/nsNavBookmarks.h
rename to toolkit/components/places/nsNavBookmarks.h
rename from toolkit/components/places/src/nsNavHistory.cpp
rename to toolkit/components/places/nsNavHistory.cpp
rename from toolkit/components/places/src/nsNavHistory.h
rename to toolkit/components/places/nsNavHistory.h
rename from toolkit/components/places/src/nsNavHistoryQuery.cpp
rename to toolkit/components/places/nsNavHistoryQuery.cpp
rename from toolkit/components/places/src/nsNavHistoryQuery.h
rename to toolkit/components/places/nsNavHistoryQuery.h
rename from toolkit/components/places/src/nsNavHistoryResult.cpp
rename to toolkit/components/places/nsNavHistoryResult.cpp
rename from toolkit/components/places/src/nsNavHistoryResult.h
rename to toolkit/components/places/nsNavHistoryResult.h
rename from toolkit/components/places/public/nsPIPlacesDatabase.idl
rename to toolkit/components/places/nsPIPlacesDatabase.idl
rename from toolkit/components/places/public/nsPIPlacesHistoryListenersNotifier.idl
rename to toolkit/components/places/nsPIPlacesHistoryListenersNotifier.idl
rename from toolkit/components/places/src/nsPlacesAutoComplete.js
rename to toolkit/components/places/nsPlacesAutoComplete.js
rename from toolkit/components/places/src/nsPlacesAutoComplete.manifest
rename to toolkit/components/places/nsPlacesAutoComplete.manifest
rename from toolkit/components/places/src/nsPlacesExpiration.js
rename to toolkit/components/places/nsPlacesExpiration.js
rename from toolkit/components/places/src/nsPlacesImportExportService.cpp
rename to toolkit/components/places/nsPlacesImportExportService.cpp
rename from toolkit/components/places/src/nsPlacesImportExportService.h
rename to toolkit/components/places/nsPlacesImportExportService.h
rename from toolkit/components/places/src/nsPlacesIndexes.h
rename to toolkit/components/places/nsPlacesIndexes.h
rename from toolkit/components/places/src/nsPlacesMacros.h
rename to toolkit/components/places/nsPlacesMacros.h
rename from toolkit/components/places/src/nsPlacesModule.cpp
rename to toolkit/components/places/nsPlacesModule.cpp
rename from toolkit/components/places/src/nsPlacesTables.h
rename to toolkit/components/places/nsPlacesTables.h
rename from toolkit/components/places/src/nsPlacesTriggers.h
rename to toolkit/components/places/nsPlacesTriggers.h
rename from toolkit/components/places/src/nsTaggingService.js
rename to toolkit/components/places/nsTaggingService.js
deleted file mode 100644
--- a/toolkit/components/places/public/Makefile.in
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# ***** 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 Places code.
-#
-# The Initial Developer of the Original Code is
-# Google Inc.
-# Portions created by the Initial Developer are Copyright (C) 2005
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Brett Wilson <brettw@gmail.com>
-#
-# 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 = places
-XPIDL_MODULE = places
-
-XPIDLSRCS = \
- nsINavHistoryService.idl \
- $(NULL)
-
-ifdef MOZ_PLACES
-XPIDLSRCS += \
- nsIAnnotationService.idl \
- nsIBrowserHistory.idl \
- nsIFaviconService.idl \
- nsINavBookmarksService.idl \
- nsILivemarkService.idl \
- nsIDynamicContainer.idl \
- nsITaggingService.idl \
- nsPIPlacesDatabase.idl \
- nsPIPlacesHistoryListenersNotifier.idl \
- mozIPlacesAutoComplete.idl \
- nsIMicrosummaryService.idl \
- nsIPlacesImportExportService.idl \
- mozIAsyncHistory.idl \
- $(NULL)
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/components/places/src/Makefile.in
+++ /dev/null
@@ -1,120 +0,0 @@
-#
-# ***** 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 Places code
-#
-# The Initial Developer of the Original Code is
-# Google Inc.
-# Portions created by the Initial Developer are Copyright (C) 2005
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Brett Wilson <brettw@gmail.com>
-#
-# 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 = places
-LIBRARY_NAME = places
-LIBXUL_LIBRARY = 1
-EXPORT_LIBRARY = 1
-MODULE_NAME = nsPlacesModule
-IS_COMPONENT = 1
-
-EXPORTS_NAMESPACES = mozilla/places
-
-EXPORTS_mozilla/places = \
- History.h \
- $(NULL)
-
-CPPSRCS = \
- nsAnnoProtocolHandler.cpp \
- nsAnnotationService.cpp \
- nsFaviconService.cpp \
- nsNavHistory.cpp \
- nsNavHistoryQuery.cpp \
- nsNavHistoryResult.cpp \
- nsNavBookmarks.cpp \
- nsMaybeWeakPtr.cpp \
- nsMorkHistoryImporter.cpp \
- nsPlacesModule.cpp \
- SQLFunctions.cpp \
- Helpers.cpp \
- History.cpp \
- nsPlacesImportExportService.cpp \
- AsyncFaviconHelpers.cpp \
- PlaceInfo.cpp \
- VisitInfo.cpp \
- $(NULL)
-
-EXTRA_DSO_LDOPTS += \
- $(DEPTH)/db/morkreader/$(LIB_PREFIX)morkreader_s.$(LIB_SUFFIX) \
- $(MOZ_UNICHARUTIL_LIBS) \
- $(MOZ_COMPONENT_LIBS) \
- $(NULL)
-
-ifndef MOZ_ENABLE_LIBXUL
-EXTRA_DSO_LDOPTS += \
- $(MOZ_JS_LIBS) \
- $(NULL)
-endif
-
-LOCAL_INCLUDES += -I$(srcdir)/../../build
-
-# This is the default value. Must be in sync with the one defined in SQLite.
-DEFINES += -DSQLITE_DEFAULT_PAGE_SIZE=32768
-
-EXTRA_COMPONENTS = \
- toolkitplaces.manifest \
- nsLivemarkService.js \
- nsTaggingService.js \
- nsPlacesExpiration.js \
- nsMicrosummaryService.js \
- PlacesCategoriesStarter.js \
- $(NULL)
-
-ifdef MOZ_XUL
-EXTRA_COMPONENTS += nsPlacesAutoComplete.js nsPlacesAutoComplete.manifest
-endif
-
-EXTRA_JS_MODULES = \
- PlacesDBUtils.jsm \
- utils.js \
- $(NULL)
-
-EXTRA_PP_JS_MODULES = \
- PlacesUtils.jsm \
- $(NULL)
-
-include $(topsrcdir)/config/config.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
-include $(topsrcdir)/config/rules.mk
rename from toolkit/components/places/src/toolkitplaces.manifest
rename to toolkit/components/places/toolkitplaces.manifest
rename from toolkit/components/places/src/utils.js
rename to toolkit/components/places/utils.js
--- a/toolkit/components/satchel/Makefile.in
+++ b/toolkit/components/satchel/Makefile.in
@@ -15,37 +15,78 @@
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 2003
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Brian Ryner <bryner@brianryner.com>
+# Joe Hewitt <hewitt@netscape.com>
#
# 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 = ../../..
+DEPTH = ../../..
topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS = public src
+MODULE = satchel
+LIBRARY_NAME = satchel
+MODULE_NAME = satchel
+IS_COMPONENT = 1
+LIBXUL_LIBRARY = 1
+EXPORT_LIBRARY = 1
+
+XPIDLSRCS = \
+ nsIFormAutoComplete.idl \
+ nsIFormFillController.idl \
+ nsIFormHistory.idl \
+ nsIInputListAutoComplete.idl \
+ $(NULL)
+
+LOCAL_INCLUDES = \
+ -I$(srcdir)/../build \
+ $(NULL)
+
+CPPSRCS = \
+ nsFormFillController.cpp \
+ $(NULL)
+
+EXTRA_COMPONENTS = \
+ nsFormAutoComplete.js \
+ nsFormHistory.js \
+ nsInputListAutoComplete.js \
+ satchel.manifest \
+ $(NULL)
+
+EXTRA_JS_MODULES = \
+ nsFormAutoCompleteResult.jsm \
+ $(NULL)
+
+EXTRA_DSO_LIBS = gkgfx
ifdef ENABLE_TESTS
DIRS += test
endif
include $(topsrcdir)/config/rules.mk
+
+EXTRA_DSO_LDOPTS += \
+ $(LIBS_DIR) \
+ $(EXTRA_DSO_LIBS) \
+ $(MOZ_UNICHARUTIL_LIBS) \
+ $(MOZ_COMPONENT_LIBS) \
+ $(NULL)
rename from toolkit/components/satchel/src/formSubmitListener.js
rename to toolkit/components/satchel/formSubmitListener.js
--- a/toolkit/components/satchel/jar.mn
+++ b/toolkit/components/satchel/jar.mn
@@ -1,3 +1,3 @@
toolkit.jar:
% content satchel %content/satchel/
-* content/satchel/formSubmitListener.js (src/formSubmitListener.js)
+* content/satchel/formSubmitListener.js (formSubmitListener.js)
rename from toolkit/components/satchel/src/nsFormAutoComplete.js
rename to toolkit/components/satchel/nsFormAutoComplete.js
rename from toolkit/components/satchel/src/nsFormAutoCompleteResult.jsm
rename to toolkit/components/satchel/nsFormAutoCompleteResult.jsm
rename from toolkit/components/satchel/src/nsFormFillController.cpp
rename to toolkit/components/satchel/nsFormFillController.cpp
rename from toolkit/components/satchel/src/nsFormFillController.h
rename to toolkit/components/satchel/nsFormFillController.h
rename from toolkit/components/satchel/src/nsFormHistory.js
rename to toolkit/components/satchel/nsFormHistory.js
rename from toolkit/components/satchel/public/nsIFormAutoComplete.idl
rename to toolkit/components/satchel/nsIFormAutoComplete.idl
rename from toolkit/components/satchel/public/nsIFormFillController.idl
rename to toolkit/components/satchel/nsIFormFillController.idl
rename from toolkit/components/satchel/public/nsIFormHistory.idl
rename to toolkit/components/satchel/nsIFormHistory.idl
rename from toolkit/components/satchel/public/nsIInputListAutoComplete.idl
rename to toolkit/components/satchel/nsIInputListAutoComplete.idl
rename from toolkit/components/satchel/src/nsInputListAutoComplete.js
rename to toolkit/components/satchel/nsInputListAutoComplete.js
deleted file mode 100644
--- a/toolkit/components/satchel/public/Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# ***** 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 mozilla.org Code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Joe Hewitt <hewitt@netscape.com> (Original Author)
-#
-# 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 = satchel
-XPIDL_MODULE = satchel
-
-XPIDLSRCS = nsIFormFillController.idl \
- nsIFormAutoComplete.idl \
- nsIFormHistory.idl \
- nsIInputListAutoComplete.idl \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
rename from toolkit/components/satchel/src/satchel.manifest
rename to toolkit/components/satchel/satchel.manifest
deleted file mode 100644
--- a/toolkit/components/satchel/src/Makefile.in
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# ***** 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 mozilla.org Code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Joe Hewitt <hewitt@netscape.com> (Original Author)
-#
-# 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 = satchel
-LIBRARY_NAME = satchel
-MODULE_NAME = satchel
-IS_COMPONENT = 1
-LIBXUL_LIBRARY = 1
-EXPORT_LIBRARY = 1
-
-EXTRA_COMPONENTS = \
- nsFormHistory.js \
- nsFormAutoComplete.js \
- nsInputListAutoComplete.js \
- satchel.manifest \
- $(NULL)
-
-EXTRA_JS_MODULES = \
- nsFormAutoCompleteResult.jsm \
- $(NULL)
-
-CPPSRCS = nsFormFillController.cpp \
- $(NULL)
-
-LOCAL_INCLUDES = \
- -I$(srcdir)/../../build \
- $(NULL)
-
-EXTRA_DSO_LIBS = gkgfx
-
-include $(topsrcdir)/config/rules.mk
-
-EXTRA_DSO_LDOPTS += \
- $(LIBS_DIR) \
- $(EXTRA_DSO_LIBS) \
- $(MOZ_UNICHARUTIL_LIBS) \
- $(MOZ_COMPONENT_LIBS) \
- $(NULL)
--- a/toolkit/components/startup/Makefile.in
+++ b/toolkit/components/startup/Makefile.in
@@ -36,15 +36,40 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS = public src
+DIRS = public
+
+MODULE = toolkitcomps
+LIBRARY_NAME = appstartup_s
+FORCE_STATIC_LIB = 1
+LIBXUL_LIBRARY = 1
+
+CPPSRCS = \
+ nsAppStartup.cpp \
+ $(NULL)
+
+ifeq (os2,$(MOZ_WIDGET_TOOLKIT))
+CPPSRCS += nsUserInfoOS2.cpp
+else
+ifeq (,$(filter-out WINCE WINNT,$(OS_ARCH)))
+CPPSRCS += nsUserInfoWin.cpp
+else
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+CMMSRCS += nsUserInfoMac.mm
+else
+CPPSRCS += nsUserInfoUnix.cpp
+endif
+endif
+endif
+
+EXTRA_COMPONENTS = nsTryToClose.js nsTryToClose.manifest
ifdef ENABLE_TESTS
- DIRS += tests
+DIRS += tests
endif
include $(topsrcdir)/config/rules.mk
rename from toolkit/components/startup/src/nsAppStartup.cpp
rename to toolkit/components/startup/nsAppStartup.cpp
rename from toolkit/components/startup/src/nsAppStartup.h
rename to toolkit/components/startup/nsAppStartup.h
rename from toolkit/components/startup/src/nsTryToClose.js
rename to toolkit/components/startup/nsTryToClose.js
rename from toolkit/components/startup/src/nsTryToClose.manifest
rename to toolkit/components/startup/nsTryToClose.manifest
rename from toolkit/components/startup/src/nsUserInfo.h
rename to toolkit/components/startup/nsUserInfo.h
rename from toolkit/components/startup/src/nsUserInfoMac.h
rename to toolkit/components/startup/nsUserInfoMac.h
rename from toolkit/components/startup/src/nsUserInfoMac.mm
rename to toolkit/components/startup/nsUserInfoMac.mm
rename from toolkit/components/startup/src/nsUserInfoOS2.cpp
rename to toolkit/components/startup/nsUserInfoOS2.cpp
rename from toolkit/components/startup/src/nsUserInfoUnix.cpp
rename to toolkit/components/startup/nsUserInfoUnix.cpp
rename from toolkit/components/startup/src/nsUserInfoWin.cpp
rename to toolkit/components/startup/nsUserInfoWin.cpp
deleted file mode 100644
--- a/toolkit/components/startup/src/Makefile.in
+++ /dev/null
@@ -1,70 +0,0 @@
-# ***** 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 Mozilla Seamonkey bootstrap code.
-#
-# The Initial Developer of the Original Code is
-# Benjamin Smedberg <bsmedberg@covad.net>
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 = toolkitcomps
-LIBRARY_NAME = appstartup_s
-FORCE_STATIC_LIB = 1
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS = \
- nsAppStartup.cpp \
- $(NULL)
-
-ifeq (os2,$(MOZ_WIDGET_TOOLKIT))
-CPPSRCS += nsUserInfoOS2.cpp
-else
-ifeq (,$(filter-out WINCE WINNT,$(OS_ARCH)))
-CPPSRCS += nsUserInfoWin.cpp
-else
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-CMMSRCS += nsUserInfoMac.mm
-else
-CPPSRCS += nsUserInfoUnix.cpp
-endif
-endif
-endif
-
-EXTRA_COMPONENTS = nsTryToClose.js nsTryToClose.manifest
-
-include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/typeaheadfind/Makefile.in
+++ b/toolkit/components/typeaheadfind/Makefile.in
@@ -36,12 +36,23 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-MODULE = fastfind
-DIRS = public src
+MODULE = fastfind
+LIBRARY_NAME = fastfind_s
+GRE_MODULE = 1
+FORCE_STATIC_LIB = 1
+LIBXUL_LIBRARY = 1
+
+XPIDLSRCS = \
+ nsITypeAheadFind.idl \
+ $(NULL)
+
+CPPSRCS = \
+ nsTypeAheadFind.cpp \
+ $(NULL)
include $(topsrcdir)/config/rules.mk
rename from toolkit/components/typeaheadfind/public/nsITypeAheadFind.idl
rename to toolkit/components/typeaheadfind/nsITypeAheadFind.idl
rename from toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp
rename to toolkit/components/typeaheadfind/nsTypeAheadFind.cpp
rename from toolkit/components/typeaheadfind/src/nsTypeAheadFind.h
rename to toolkit/components/typeaheadfind/nsTypeAheadFind.h
deleted file mode 100644
--- a/toolkit/components/typeaheadfind/public/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-# ***** 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 mozilla.org Code.
-#
-# The Initial Developer of the Original Code is
-# Aaron Leventhal.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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=fastfind
-XPIDL_MODULE=fastfind
-GRE_MODULE = 1
-
-XPIDLSRCS= nsITypeAheadFind.idl \
- $(NULL)
-
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/components/typeaheadfind/src/Makefile.in
+++ /dev/null
@@ -1,56 +0,0 @@
-# ***** 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 mozilla.org Code.
-#
-# The Initial Developer of the Original Code is
-# Aaron Leventhal.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 = fastfind
-LIBRARY_NAME = fastfind_s
-GRE_MODULE = 1
-FORCE_STATIC_LIB = 1
-LIBXUL_LIBRARY = 1
-
-
-CPPSRCS = \
- nsTypeAheadFind.cpp \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
--- a/toolkit/components/url-classifier/Makefile.in
+++ b/toolkit/components/url-classifier/Makefile.in
@@ -38,16 +38,47 @@
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS = public src
+MODULE = url-classifier
+LIBRARY_NAME = urlclassifier_s
+XPIDL_MODULE = url-classifier
+LIBXUL_LIBRARY = 1
+FORCE_STATIC_LIB = 1
+
+XPIDLSRCS = \
+ nsIUrlClassifierDBService.idl \
+ nsIUrlClassifierHashCompleter.idl \
+ nsIUrlClassifierStreamUpdater.idl \
+ nsIUrlClassifierUtils.idl \
+ nsIUrlListManager.idl \
+ $(NULL)
+
+CPPSRCS = \
+ nsUrlClassifierDBService.cpp \
+ nsUrlClassifierStreamUpdater.cpp \
+ nsUrlClassifierUtils.cpp \
+ nsUrlClassifierHashCompleter.cpp \
+ $(NULL)
+
+LOCAL_INCLUDES = \
+ -I$(srcdir)/../build \
+ $(SQLITE_CFLAGS) \
+ $(NULL)
+
+EXTRA_COMPONENTS = nsURLClassifier.manifest
+
+# Same as JS components that are run through the pre-processor.
+EXTRA_PP_COMPONENTS = \
+ nsUrlClassifierLib.js \
+ nsUrlClassifierListManager.js \
+ $(NULL)
ifdef ENABLE_TESTS
-TOOL_DIRS += tests
+TOOL_DIRS += tests
endif
include $(topsrcdir)/config/rules.mk
-
rename from toolkit/components/url-classifier/public/nsIUrlClassifierDBService.idl
rename to toolkit/components/url-classifier/nsIUrlClassifierDBService.idl
rename from toolkit/components/url-classifier/public/nsIUrlClassifierHashCompleter.idl
rename to toolkit/components/url-classifier/nsIUrlClassifierHashCompleter.idl
rename from toolkit/components/url-classifier/public/nsIUrlClassifierStreamUpdater.idl
rename to toolkit/components/url-classifier/nsIUrlClassifierStreamUpdater.idl
rename from toolkit/components/url-classifier/public/nsIUrlClassifierTable.idl
rename to toolkit/components/url-classifier/nsIUrlClassifierTable.idl
rename from toolkit/components/url-classifier/public/nsIUrlClassifierUtils.idl
rename to toolkit/components/url-classifier/nsIUrlClassifierUtils.idl
rename from toolkit/components/url-classifier/public/nsIUrlListManager.idl
rename to toolkit/components/url-classifier/nsIUrlListManager.idl
rename from toolkit/components/url-classifier/src/nsURLClassifier.manifest
rename to toolkit/components/url-classifier/nsURLClassifier.manifest
rename from toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp
rename to toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
rename from toolkit/components/url-classifier/src/nsUrlClassifierDBService.h
rename to toolkit/components/url-classifier/nsUrlClassifierDBService.h
rename from toolkit/components/url-classifier/src/nsUrlClassifierHashCompleter.cpp
rename to toolkit/components/url-classifier/nsUrlClassifierHashCompleter.cpp
rename from toolkit/components/url-classifier/src/nsUrlClassifierHashCompleter.h
rename to toolkit/components/url-classifier/nsUrlClassifierHashCompleter.h
rename from toolkit/components/url-classifier/src/nsUrlClassifierLib.js
rename to toolkit/components/url-classifier/nsUrlClassifierLib.js
--- a/toolkit/components/url-classifier/src/nsUrlClassifierLib.js
+++ b/toolkit/components/url-classifier/nsUrlClassifierLib.js
@@ -40,27 +40,27 @@
// single component.
const Cc = Components.classes;
const Ci = Components.interfaces;
const G_GDEBUG = false;
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-#include ../content/moz/lang.js
-#include ../content/moz/preferences.js
-#include ../content/moz/debug.js
-#include ../content/moz/alarm.js
-#include ../content/moz/cryptohasher.js
-#include ../content/moz/observer.js
-#include ../content/moz/protocol4.js
+#include ./content/moz/lang.js
+#include ./content/moz/preferences.js
+#include ./content/moz/debug.js
+#include ./content/moz/alarm.js
+#include ./content/moz/cryptohasher.js
+#include ./content/moz/observer.js
+#include ./content/moz/protocol4.js
-#include ../content/request-backoff.js
-#include ../content/url-crypto-key-manager.js
-#include ../content/xml-fetcher.js
+#include ./content/request-backoff.js
+#include ./content/url-crypto-key-manager.js
+#include ./content/xml-fetcher.js
// Expose this whole component.
var lib = this;
function UrlClassifierLib() {
this.wrappedJSObject = lib;
}
UrlClassifierLib.prototype.classID = Components.ID("{26a4a019-2827-4a89-a85c-5931a678823a}");
rename from toolkit/components/url-classifier/src/nsUrlClassifierListManager.js
rename to toolkit/components/url-classifier/nsUrlClassifierListManager.js
--- a/toolkit/components/url-classifier/src/nsUrlClassifierListManager.js
+++ b/toolkit/components/url-classifier/nsUrlClassifierListManager.js
@@ -35,17 +35,17 @@
#
# ***** END LICENSE BLOCK *****
const Cc = Components.classes;
const Ci = Components.interfaces;
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-#include ../content/listmanager.js
+#include ./content/listmanager.js
var modScope = this;
function Init() {
// Pull the library in.
var jslib = Cc["@mozilla.org/url-classifier/jslib;1"]
.getService().wrappedJSObject;
Function.prototype.inherits = jslib.Function.prototype.inherits;
modScope.G_Preferences = jslib.G_Preferences;
rename from toolkit/components/url-classifier/src/nsUrlClassifierStreamUpdater.cpp
rename to toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.cpp
rename from toolkit/components/url-classifier/src/nsUrlClassifierStreamUpdater.h
rename to toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.h
rename from toolkit/components/url-classifier/src/nsUrlClassifierUtils.cpp
rename to toolkit/components/url-classifier/nsUrlClassifierUtils.cpp
rename from toolkit/components/url-classifier/src/nsUrlClassifierUtils.h
rename to toolkit/components/url-classifier/nsUrlClassifierUtils.h
deleted file mode 100644
--- a/toolkit/components/url-classifier/public/Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-DEPTH=../../../..
-topsrcdir=@top_srcdir@
-srcdir=@srcdir@
-VPATH=@srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = url-classifier
-XPIDL_MODULE = url-classifier
-
-XPIDLSRCS = nsIUrlClassifierDBService.idl \
- nsIUrlClassifierStreamUpdater.idl \
- nsIUrlClassifierUtils.idl \
- nsIUrlClassifierHashCompleter.idl \
- nsIUrlListManager.idl \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/components/url-classifier/src/Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
-DEPTH = ../../../..
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = url-classifier
-LIBRARY_NAME = urlclassifier_s
-XPIDL_MODULE = url-classifier
-LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
-
-
-
-CPPSRCS = \
- nsUrlClassifierDBService.cpp \
- nsUrlClassifierStreamUpdater.cpp \
- nsUrlClassifierUtils.cpp \
- nsUrlClassifierHashCompleter.cpp \
- $(NULL)
-
-LOCAL_INCLUDES = \
- -I$(srcdir)/../../build \
- $(SQLITE_CFLAGS) \
- $(NULL)
-
-EXTRA_COMPONENTS = nsURLClassifier.manifest
-
-# Same as JS components that are run through the pre-processor.
-EXTRA_PP_COMPONENTS = nsUrlClassifierLib.js \
- nsUrlClassifierListManager.js \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
--- a/toolkit/components/urlformatter/Makefile.in
+++ b/toolkit/components/urlformatter/Makefile.in
@@ -30,22 +30,34 @@
# 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@
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS = public src
+MODULE = urlformatter
+
+XPIDLSRCS = \
+ nsIURLFormatter.idl \
+ $(NULL)
+
+EXTRA_COMPONENTS = \
+ nsURLFormatter.manifest \
+ $(NULL)
+
+EXTRA_PP_COMPONENTS = \
+ nsURLFormatter.js \
+ $(NULL)
ifdef ENABLE_TESTS
- DIRS += tests
+DIRS += tests
endif
include $(topsrcdir)/config/rules.mk
rename from toolkit/components/urlformatter/public/nsIURLFormatter.idl
rename to toolkit/components/urlformatter/nsIURLFormatter.idl
rename from toolkit/components/urlformatter/src/nsURLFormatter.js
rename to toolkit/components/urlformatter/nsURLFormatter.js
rename from toolkit/components/urlformatter/src/nsURLFormatter.manifest
rename to toolkit/components/urlformatter/nsURLFormatter.manifest
deleted file mode 100644
--- a/toolkit/components/urlformatter/public/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Dietrich Ayala <dietrich@mozilla.com>
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 = urlformatter
-#XPIDL_MODULE = urlformatter
-
-XPIDLSRCS = \
- nsIURLFormatter.idl \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/components/urlformatter/src/Makefile.in
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Dietrich Ayala <dietrich@mozilla.com>
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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
-
-EXTRA_COMPONENTS = \
- nsURLFormatter.manifest \
- $(NULL)
-
-EXTRA_PP_COMPONENTS = \
- nsURLFormatter.js \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/toolkit/mozapps/Makefile.in
+++ /dev/null
@@ -1,63 +0,0 @@
-# ***** 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 Browser code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Ben Goodger <ben@bengoodger.com>
-# Shawn Wilsher <me@shawnwilsher.com>
-#
-# 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
-
-PARALLEL_DIRS = \
- downloads \
- extensions \
- handling \
- plugins \
- shared \
- update \
- xpinstall \
- $(NULL)
-
-ifeq ($(OS_ARCH),WINCE)
-ifdef WINCE_WINDOWS_MOBILE
-DIRS += readstrings
-DIRS += installer/wince
-endif
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/mozapps/jar.mn
+++ /dev/null
@@ -1,29 +0,0 @@
-toolkit.jar:
-% content mozapps %content/mozapps/
-* content/mozapps/downloads/helperApps.js (downloads/content/helperApps.js)
-* content/mozapps/downloads/unknownContentType.xul (downloads/content/unknownContentType.xul)
-* content/mozapps/downloads/downloads.xul (downloads/content/downloads.xul)
-* content/mozapps/downloads/downloads.js (downloads/content/downloads.js)
-* content/mozapps/downloads/DownloadProgressListener.js (downloads/content/DownloadProgressListener.js)
- content/mozapps/downloads/downloads.css (downloads/content/downloads.css)
-* content/mozapps/downloads/download.xml (downloads/content/download.xml)
-* content/mozapps/preferences/ocsp.js (preferences/ocsp.js)
-* content/mozapps/preferences/ocsp.xul (preferences/ocsp.xul)
-* content/mozapps/preferences/fontbuilder.js (preferences/fontbuilder.js)
-* content/mozapps/preferences/changemp.js (preferences/changemp.js)
-* content/mozapps/preferences/changemp.xul (preferences/changemp.xul)
-* content/mozapps/preferences/removemp.js (preferences/removemp.js)
-* content/mozapps/preferences/removemp.xul (preferences/removemp.xul)
- content/mozapps/plugins/pluginInstallerWizard.xul (plugins/content/pluginInstallerWizard.xul)
- content/mozapps/plugins/pluginInstallerWizard.js (plugins/content/pluginInstallerWizard.js)
- content/mozapps/plugins/pluginInstallerWizard.css (plugins/content/pluginInstallerWizard.css)
- content/mozapps/plugins/pluginInstallerDatasource.js (plugins/content/pluginInstallerDatasource.js)
- content/mozapps/plugins/pluginInstallerService.js (plugins/content/pluginInstallerService.js)
- content/mozapps/plugins/pluginProblem.xml (plugins/content/pluginProblem.xml)
- content/mozapps/plugins/pluginProblemContent.css (plugins/content/pluginProblemContent.css)
- content/mozapps/plugins/pluginProblemBinding.css (plugins/content/pluginProblemBinding.css)
- content/mozapps/plugins/pluginFinderBinding.css (plugins/content/pluginFinderBinding.css)
- content/mozapps/handling/handler.css (handling/content/handler.css)
- content/mozapps/handling/handler.xml (handling/content/handler.xml)
- content/mozapps/handling/dialog.xul (handling/content/dialog.xul)
- content/mozapps/handling/dialog.js (handling/content/dialog.js)
--- a/toolkit/profile/Makefile.in
+++ b/toolkit/profile/Makefile.in
@@ -30,22 +30,49 @@
# 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@
+DEPTH = ../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS = public src
+MODULE = xulapp
+XPIDL_MODULE = toolkitprofile
+LIBRARY_NAME = profile_s
+FORCE_STATIC_LIB = 1
+LIBXUL_LIBRARY = 1
+
+XPIDLSRCS = \
+ nsIProfileMigrator.idl \
+ nsIToolkitProfile.idl \
+ nsIToolkitProfileService.idl \
+ $(NULL)
+
+CPPSRCS = \
+ nsProfileLock.cpp \
+ nsToolkitProfileService.cpp \
+ $(NULL)
+
+LOCAL_INCLUDES = \
+ -I$(srcdir)/../xre \
+ -I$(topsrcdir)/profile/dirserviceprovider/src \
+ $(NULL)
+
+DEFINES += -DIMPL_XREAPI
+
+GARBAGE += nsProfileLock.cpp
ifdef ENABLE_TESTS
- DIRS += test
+DIRS += test
endif
include $(topsrcdir)/config/rules.mk
+
+export:: $(topsrcdir)/profile/dirserviceprovider/src/nsProfileLock.cpp
+ $(INSTALL) $^ .
rename from toolkit/profile/public/nsIProfileMigrator.idl
rename to toolkit/profile/nsIProfileMigrator.idl
rename from toolkit/profile/public/nsIToolkitProfile.idl
rename to toolkit/profile/nsIToolkitProfile.idl
rename from toolkit/profile/public/nsIToolkitProfileService.idl
rename to toolkit/profile/nsIToolkitProfileService.idl
rename from toolkit/profile/src/nsToolkitProfileService.cpp
rename to toolkit/profile/nsToolkitProfileService.cpp
deleted file mode 100644
--- a/toolkit/profile/public/Makefile.in
+++ /dev/null
@@ -1,53 +0,0 @@
-# ***** 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 Mozilla Seamonkey bootstrap code.
-#
-# The Initial Developer of the Original Code is
-# Benjamin Smedberg <bsmedberg@covad.net>
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 = xulapp
-XPIDL_MODULE = toolkitprofile
-
-XPIDLSRCS = \
- nsIProfileMigrator.idl \
- nsIToolkitProfile.idl \
- nsIToolkitProfileService.idl \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/toolkit/profile/src/Makefile.in
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# ***** 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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 = xulapp
-LIBRARY_NAME = profile_s
-FORCE_STATIC_LIB = 1
-LIBXUL_LIBRARY = 1
-
-
-LOCAL_INCLUDES = \
- -I$(srcdir)/../../xre \
- -I$(topsrcdir)/profile/dirserviceprovider/src \
- $(NULL)
-
-CPPSRCS = \
- nsProfileLock.cpp \
- nsToolkitProfileService.cpp \
- $(NULL)
-
-DEFINES += -DIMPL_XREAPI
-
-GARBAGE += nsProfileLock.cpp
-
-include $(topsrcdir)/config/rules.mk
-
-export:: $(topsrcdir)/profile/dirserviceprovider/src/nsProfileLock.cpp
- $(INSTALL) $^ .
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -611,95 +611,61 @@ MAKEFILES_xulapp="
toolkit/crashreporter/google-breakpad/src/common/dwarf/Makefile
toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile
toolkit/crashreporter/google-breakpad/src/common/windows/Makefile
toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile
toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile
toolkit/crashreporter/google-breakpad/src/tools/solaris/dump_syms/Makefile
toolkit/content/Makefile
toolkit/components/alerts/Makefile
- toolkit/components/alerts/public/Makefile
- toolkit/components/alerts/src/Makefile
- toolkit/components/alerts/src/mac/Makefile
- toolkit/components/alerts/src/mac/growl/Makefile
+ toolkit/components/alerts/mac/Makefile
+ toolkit/components/alerts/mac/growl/Makefile
toolkit/components/apppicker/Makefile
toolkit/components/autocomplete/Makefile
- toolkit/components/autocomplete/public/Makefile
- toolkit/components/autocomplete/src/Makefile
toolkit/components/Makefile
toolkit/components/build/Makefile
toolkit/components/commandlines/Makefile
- toolkit/components/commandlines/public/Makefile
- toolkit/components/commandlines/src/Makefile
toolkit/components/console/Makefile
toolkit/components/contentprefs/Makefile
- toolkit/components/contentprefs/src/Makefile
toolkit/components/cookie/Makefile
- toolkit/components/downloads/public/Makefile
toolkit/components/downloads/Makefile
- toolkit/components/downloads/src/Makefile
toolkit/components/exthelper/Makefile
toolkit/components/feeds/Makefile
- toolkit/components/feeds/public/Makefile
- toolkit/components/feeds/src/Makefile
toolkit/components/filepicker/Makefile
- toolkit/components/filepicker/public/Makefile
- toolkit/components/filepicker/src/Makefile
toolkit/components/find/Makefile
- toolkit/components/find/public/Makefile
- toolkit/components/find/src/Makefile
toolkit/components/help/Makefile
toolkit/components/intl/Makefile
toolkit/components/microformats/Makefile
- toolkit/components/microformats/src/Makefile
toolkit/components/parentalcontrols/Makefile
- toolkit/components/parentalcontrols/public/Makefile
- toolkit/components/parentalcontrols/src/Makefile
toolkit/components/passwordmgr/Makefile
- toolkit/components/passwordmgr/public/Makefile
- toolkit/components/passwordmgr/src/Makefile
toolkit/components/passwordmgr/content/Makefile
toolkit/components/passwordmgr/test/Makefile
toolkit/components/places/Makefile
- toolkit/components/places/public/Makefile
- toolkit/components/places/src/Makefile
toolkit/components/printing/Makefile
toolkit/components/satchel/Makefile
- toolkit/components/satchel/public/Makefile
- toolkit/components/satchel/src/Makefile
toolkit/components/search/Makefile
toolkit/spatial-navigation/Makefile
toolkit/components/startup/Makefile
toolkit/components/startup/public/Makefile
- toolkit/components/startup/src/Makefile
toolkit/components/statusfilter/Makefile
toolkit/components/typeaheadfind/Makefile
- toolkit/components/typeaheadfind/public/Makefile
- toolkit/components/typeaheadfind/src/Makefile
toolkit/components/url-classifier/Makefile
- toolkit/components/url-classifier/public/Makefile
- toolkit/components/url-classifier/src/Makefile
toolkit/components/urlformatter/Makefile
- toolkit/components/urlformatter/public/Makefile
- toolkit/components/urlformatter/src/Makefile
toolkit/components/viewconfig/Makefile
toolkit/components/viewsource/Makefile
toolkit/locales/Makefile
- toolkit/mozapps/Makefile
toolkit/mozapps/downloads/Makefile
toolkit/mozapps/extensions/Makefile
toolkit/mozapps/handling/Makefile
toolkit/mozapps/plugins/Makefile
toolkit/mozapps/readstrings/Makefile
toolkit/mozapps/update/Makefile
toolkit/mozapps/update/updater/Makefile
toolkit/mozapps/xpinstall/Makefile
toolkit/profile/Makefile
- toolkit/profile/public/Makefile
- toolkit/profile/src/Makefile
toolkit/system/dbus/Makefile
toolkit/system/gnome/Makefile
toolkit/system/unixproxy/Makefile
toolkit/system/osxproxy/Makefile
toolkit/system/windowsproxy/Makefile
toolkit/themes/Makefile
toolkit/themes/gnomestripe/global/Makefile
toolkit/themes/gnomestripe/Makefile
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -31,45 +31,45 @@
# 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@
+DEPTH = ../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = xulapp
LIBRARY_NAME = xulapp_s
LIBXUL_LIBRARY = 1
FORCE_STATIC_LIB = 1
XPIDLSRCS = \
- nsINativeAppSupport.idl \
- $(NULL)
+ nsINativeAppSupport.idl \
+ $(NULL)
ifneq (,$(filter WINCE WINNT,$(OS_ARCH)))
XPIDLSRCS += nsIWinAppHelper.idl
endif
CPPSRCS = \
- nsAppRunner.cpp \
- nsConsoleWriter.cpp \
- nsXREDirProvider.cpp \
- nsNativeAppSupportBase.cpp \
- nsAppData.cpp \
- nsSigHandlers.cpp \
- $(NULL)
+ nsAppRunner.cpp \
+ nsConsoleWriter.cpp \
+ nsXREDirProvider.cpp \
+ nsNativeAppSupportBase.cpp \
+ nsAppData.cpp \
+ nsSigHandlers.cpp \
+ $(NULL)
ifdef MOZ_SPLASHSCREEN
ifeq ($(OS_ARCH),WINCE)
CPPSRCS += nsSplashScreenWin.cpp
else
CPPSRCS += nsSplashScreenDummy.cpp
endif
endif
@@ -125,39 +125,39 @@ ifdef MOZ_X11
CPPSRCS += nsX11ErrorHandler.cpp
endif
ifeq ($(OS_TARGET),Android)
CPPSRCS += nsAndroidStartup.cpp
DEFINES += -DANDROID_PACKAGE_NAME='"$(ANDROID_PACKAGE_NAME)"'
endif
-SHARED_LIBRARY_LIBS += ../profile/src/$(LIB_PREFIX)profile_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += ../profile/$(LIB_PREFIX)profile_s.$(LIB_SUFFIX)
ifdef MOZ_ENABLE_XREMOTE
SHARED_LIBRARY_LIBS += $(DEPTH)/widget/src/xremoteclient/$(LIB_PREFIX)xremote_client_s.$(LIB_SUFFIX)
LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/xremoteclient
endif
ifdef MOZ_CRASHREPORTER
SHARED_LIBRARY_LIBS += $(DEPTH)/toolkit/crashreporter/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX)
ifeq ($(OS_ARCH),WINNT)
SHARED_LIBRARY_LIBS += \
- $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/windows/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
- $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/$(LIB_PREFIX)crash_generation_s.$(LIB_SUFFIX) \
- $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/windows/$(LIB_PREFIX)breakpad_windows_common_s.$(LIB_SUFFIX)
+ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/windows/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
+ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/$(LIB_PREFIX)crash_generation_s.$(LIB_SUFFIX) \
+ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/windows/$(LIB_PREFIX)breakpad_windows_common_s.$(LIB_SUFFIX)
endif
ifeq ($(OS_ARCH),Darwin)
SHARED_LIBRARY_LIBS += \
- $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/$(LIB_PREFIX)minidump_file_writer_s.$(LIB_SUFFIX) \
- $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/$(LIB_PREFIX)crash_generation_s.$(LIB_SUFFIX) \
- $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/mac/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
- $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \
- $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX)
+ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/$(LIB_PREFIX)minidump_file_writer_s.$(LIB_SUFFIX) \
+ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/$(LIB_PREFIX)crash_generation_s.$(LIB_SUFFIX) \
+ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/mac/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
+ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \
+ $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX)
endif
ifeq ($(OS_ARCH),Linux)
SHARED_LIBRARY_LIBS += \
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/$(LIB_PREFIX)crash_generation_s.$(LIB_SUFFIX) \
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/linux/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/$(LIB_PREFIX)minidump_writer_s.$(LIB_SUFFIX) \
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/client/$(LIB_PREFIX)minidump_file_writer_s.$(LIB_SUFFIX) \
@@ -191,20 +191,20 @@ LOCAL_INCLUDES += \
$(NULL)
ifdef BUILD_STATIC_LIBS
export::
@$(PYTHON) $(MOZILLA_DIR)/config/buildlist.py $(FINAL_LINK_COMP_NAMES) Apprunner
endif
LOCAL_INCLUDES += \
- -I$(srcdir) \
- -I$(srcdir)/../profile/src \
- -I$(topsrcdir)/config \
- $(NULL)
+ -I$(srcdir) \
+ -I$(srcdir)/../profile \
+ -I$(topsrcdir)/config \
+ $(NULL)
CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
CXXFLAGS += $(MOZ_PANGO_CFLAGS)
endif
ifdef BUILD_STATIC_LIBS
@@ -212,30 +212,30 @@ DEFINES += -D_BUILD_STATIC_BIN
endif
DEFINES += \
-DOS_TARGET=\"$(OS_TARGET)\" \
-DMOZ_WIDGET_TOOLKIT=\"$(MOZ_WIDGET_TOOLKIT)\"
ifdef TARGET_XPCOM_ABI
DEFINES += \
- -DTARGET_XPCOM_ABI=\"$(TARGET_XPCOM_ABI)\" \
- -DTARGET_OS_ABI=\"$(OS_TARGET)_$(TARGET_XPCOM_ABI)\" \
- $(NULL)
+ -DTARGET_XPCOM_ABI=\"$(TARGET_XPCOM_ABI)\" \
+ -DTARGET_OS_ABI=\"$(OS_TARGET)_$(TARGET_XPCOM_ABI)\" \
+ $(NULL)
endif
DEFINES += -DTOOLKIT_EM_VERSION=\"$(shell $(PERL) $(topsrcdir)/config/milestone.pl --topsrcdir=$(topsrcdir))\"
ifdef WRAP_SYSTEM_INCLUDES
-DEFINES += -DWRAP_SYSTEM_INCLUDES
+DEFINES += -DWRAP_SYSTEM_INCLUDES
endif
ifeq ($(OS_ARCH),Linux)
ifneq (,$(findstring lib64,$(libdir)))
-DEFINES += -DHAVE_USR_LIB64_DIR
+DEFINES += -DHAVE_USR_LIB64_DIR
endif
endif
MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null))
# strip a trailing slash from the repo URL because it's not always present,
# and we want to construct a working URL in buildconfig.html
# make+shell+sed = awful
_dollar=$$
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@@ -35,24 +35,24 @@
# 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@
+DEPTH = ../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-DIRS = profile
+DIRS = profile
PREF_JS_EXPORTS = $(srcdir)/xulrunner.js
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js)
DEFINES += -DAB_CD=$(AB_CD)
ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH)))
PROGRAM = xulrunner$(BIN_SUFFIX)
@@ -83,39 +83,39 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
CPPSRCS += nsRegisterGREVoid.cpp
else
CPPSRCS += nsRegisterGREUnix.cpp
endif
endif
endif
LOCAL_INCLUDES += \
- -I$(topsrcdir)/toolkit/xre \
- -I$(topsrcdir)/toolkit/profile/src \
- -I$(topsrcdir)/xpcom/base \
- $(NULL)
+ -I$(topsrcdir)/toolkit/xre \
+ -I$(topsrcdir)/toolkit/profile \
+ -I$(topsrcdir)/xpcom/base \
+ $(NULL)
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
TK_LIBS := -framework Cocoa $(TK_LIBS)
endif
ifndef MOZ_ENABLE_LIBXUL
ifeq (bundle,$(MOZ_FS_LAYOUT))
LIBS += $(DIST)/bin/XUL
else
EXTRA_DSO_LIBS += xul
endif
endif
LIBS += \
- $(EXTRA_DSO_LIBS) \
- $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
- $(XPCOM_LIBS) \
- $(NSPR_LIBS) \
- $(NULL)
+ $(EXTRA_DSO_LIBS) \
+ $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
+ $(XPCOM_LIBS) \
+ $(NSPR_LIBS) \
+ $(NULL)
ifdef MOZ_JPROF
LIBS += -ljprof
endif
ifndef MOZ_WINCONSOLE
ifdef MOZ_DEBUG
MOZ_WINCONSOLE = 1
@@ -209,19 +209,19 @@ install:: xulrunner
$(SYSINSTALL) $< $(DESTDIR)$(bindir)
GARBAGE += xulrunner
endif
endif
ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
-ICON_FILES = \
- $(DIST)/branding/document.png \
- $(NULL)
+ICON_FILES = \
+ $(DIST)/branding/document.png \
+ $(NULL)
libs:: $(ICON_FILES)
$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/icons
install::
$(SYSINSTALL) $(IFLAGS1) $(ICON_FILES) $(DESTDIR)$(mozappdir)/icons
endif