--- a/accessible/build/Makefile.in
+++ b/accessible/build/Makefile.in
@@ -49,18 +49,16 @@ EXPORT_LIBRARY = 1
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = access
endif
IS_COMPONENT = 1
MODULE_NAME = nsAccessibilityModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = accessibility.pkg
-
REQUIRES = xpcom \
$(NULL)
CPPSRCS = nsAccessibilityFactory.cpp
LOCAL_INCLUDES = -I$(srcdir)/../src
SHARED_LIBRARY_LIBS = \
deleted file mode 100644
--- a/accessible/build/accessibility.pkg
+++ /dev/null
@@ -1,17 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/accessibility.xpt
-#if MOZ_WIDGET_TOOLKIT==windows
-!xpt dist/bin/components/accessibility-msaa.xpt
-#endif
-
-# xxxbsmedberg why is this in the browser, but the other stuff in gecko?
-[xpfe-browser browser]
-#if MOZ_WIDGET_TOOLKIT==windows
-dist/bin/AccessibleMarshal.dll
-dist/bin/IA2Marshal.dll
-#endif
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -39,17 +39,16 @@
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = build
-PACKAGE_FILE = build.pkg
ifeq (,$(filter WINCE WINNT OS2,$(OS_ARCH)))
DIRS = unix
endif
ifeq (WINNT,$(OS_ARCH))
DIRS = win32
endif
deleted file mode 100644
--- a/build/build.pkg
+++ /dev/null
@@ -1,4 +0,0 @@
-[unpackaged-files]
-!optional dist/bin/.autoreg
-!optional dist/bin/asdecode
-!optional dist/bin/nsinstall@BINS@
--- a/build/unix/Makefile.in
+++ b/build/unix/Makefile.in
@@ -39,17 +39,16 @@
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = build
-PACKAGE_FILE = unix.pkg
include $(topsrcdir)/config/rules.mk
libs:: $(srcdir)/run-mozilla.sh
$(INSTALL) $< $(DIST)/bin
ifeq ($(OS_ARCH),OpenVMS)
libs:: vms/mozilla.com vms/install.com vms/getinfo.com
deleted file mode 100644
--- a/build/unix/unix.pkg
+++ /dev/null
@@ -1,12 +0,0 @@
-# it appears that all of our applications need this,
-# so this can be part of gecko-support packaged with every
-# application and the embedding packages
-
-[gecko-support]
-dist/bin/run-mozilla.sh
-
-[gecko-devel]
-dist/bin/mozilla-config
-
-[unpackaged-files]
-!optional dist/bin/elf-dynstr-gc
--- a/caps/src/Makefile.in
+++ b/caps/src/Makefile.in
@@ -45,18 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = caps
LIBRARY_NAME = caps
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsSecurityManagerModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = caps.pkg
-
REQUIRES = xpcom \
string \
pref \
js \
dom \
xpconnect \
necko \
jar \
deleted file mode 100644
--- a/caps/src/caps.pkg
+++ /dev/null
@@ -1,7 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/caps.xpt
--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@@ -45,18 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = chrome
LIBRARY_NAME = chrome
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsChromeModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = chrome.pkg
-
REQUIRES = xpcom \
string \
rdf \
content \
xuldoc \
gfx \
layout \
locale \
deleted file mode 100755
--- a/chrome/src/chrome.pkg
+++ /dev/null
@@ -1,9 +0,0 @@
-# since the chrome service has been forked, it is
-# part of the new toolkit, it is not part of the gecko core
-[toolkit]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/chrome.xpt
--- a/db/mork/build/Makefile.in
+++ b/db/mork/build/Makefile.in
@@ -44,18 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = mork
LIBRARY_NAME = mork
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsMorkModule
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = mork.pkg
-
REQUIRES = xpcom \
$(NULL)
CPPSRCS = nsMorkFactory.cpp
EXPORTS = \
nsMorkCID.h \
nsIMdbFactoryFactory.h \
deleted file mode 100644
--- a/db/mork/build/mork.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[xpfe-browser browser]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
--- a/dbm/tests/Makefile.in
+++ b/dbm/tests/Makefile.in
@@ -39,18 +39,16 @@ DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = dbm
-PACKAGE_FILE = dbmtest.pkg
-
PROGRAM = lots$(BIN_SUFFIX)
CSRCS = lots.c
ifeq ($(OS_ARCH),WINNT)
EXTRA_DSO_LIBS = dbm$(MOZ_BITS)
else
EXTRA_DSO_LIBS = mozdbm_s
deleted file mode 100644
--- a/dbm/tests/dbmtest.pkg
+++ /dev/null
@@ -1,2 +0,0 @@
-[gecko-tests]
-dist/bin/lots@BINS@
--- a/docshell/build/Makefile.in
+++ b/docshell/build/Makefile.in
@@ -47,18 +47,16 @@ MODULE_NAME = docshell_provider
include $(DEPTH)/config/autoconf.mk
LIBRARY_NAME = docshell
EXPORT_LIBRARY = 1
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = docshell.pkg
-
REQUIRES = xpcom \
string \
dom \
shistory \
necko \
nkcache \
gfx \
thebes \
deleted file mode 100644
--- a/docshell/build/docshell.pkg
+++ /dev/null
@@ -1,18 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-
-#if OS_ARCH==WINNT
-# WTF?
-!xpt dist/bin/components/docshell_base.xpt
-#else
-!xpt dist/bin/components/docshell.xpt
-#endif
-
-!xpt dist/bin/components/uriloader.xpt
-!xpt dist/bin/components/exthandler.xpt
-!xpt dist/bin/components/shistory.xpt
-!xpt dist/bin/components/prefetch.xpt
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@@ -44,18 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = editor
LIBRARY_NAME = composer
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsComposerModule
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = composer.pkg
-
REQUIRES = xpcom \
string \
unicharutil \
dom \
layout \
content \
uriloader \
txmgr \
deleted file mode 100644
--- a/editor/composer/src/composer.pkg
+++ /dev/null
@@ -1,28 +0,0 @@
-[xpfe-browser]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/composer.xpt
-
-dist/bin/res/EditorOverride.css
-dist/bin/res/grabber.gif
-dist/bin/res/table-add-column-after-active.gif
-dist/bin/res/table-add-column-after-hover.gif
-dist/bin/res/table-add-column-after.gif
-dist/bin/res/table-add-column-before-active.gif
-dist/bin/res/table-add-column-before-hover.gif
-dist/bin/res/table-add-column-before.gif
-dist/bin/res/table-add-row-after-active.gif
-dist/bin/res/table-add-row-after-hover.gif
-dist/bin/res/table-add-row-after.gif
-dist/bin/res/table-add-row-before-active.gif
-dist/bin/res/table-add-row-before-hover.gif
-dist/bin/res/table-add-row-before.gif
-dist/bin/res/table-remove-column-active.gif
-dist/bin/res/table-remove-column-hover.gif
-dist/bin/res/table-remove-column.gif
-dist/bin/res/table-remove-row-active.gif
-dist/bin/res/table-remove-row-hover.gif
-dist/bin/res/table-remove-row.gif
--- a/editor/txmgr/src/Makefile.in
+++ b/editor/txmgr/src/Makefile.in
@@ -44,18 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = txmgr
LIBRARY_NAME = txmgr
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsTransactionManagerModule
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = txmgr.pkg
-
REQUIRES = xpcom \
string \
$(NULL)
CPPSRCS = \
nsTransactionItem.cpp \
nsTransactionList.cpp \
nsTransactionManager.cpp \
deleted file mode 100644
--- a/editor/txmgr/src/txmgr.pkg
+++ /dev/null
@@ -1,12 +0,0 @@
-[xpfe-browser browser]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/txmgr.xpt
-
-#if ENABLE_TESTS
-[gecko-tests]
-dist/bin/TestTXMgr@BINS@
-#endif
--- a/embedding/Makefile.in
+++ b/embedding/Makefile.in
@@ -39,17 +39,16 @@
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = embed
-PACKAGE_FILE = embed.pkg
DIRS = base components browser
ifdef ENABLE_TESTS
XPCSHELL_TESTS = tests/unit
DIRS += test
endif
--- a/embedding/browser/activex/src/Makefile.in
+++ b/embedding/browser/activex/src/Makefile.in
@@ -38,17 +38,16 @@
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = activex
-PACKAGE_FILE = activex.pkg
DIRS = $(NULL)
# Common
DIRS += common
# ActiveX plugin
ifdef MOZ_ACTIVEX_SCRIPTING_SUPPORT
deleted file mode 100644
--- a/embedding/browser/activex/src/activex.pkg
+++ /dev/null
@@ -1,3 +0,0 @@
-[gecko]
-dist/bin/mozctl.dll
-dist/bin/mozctlx.dll
--- a/embedding/browser/activex/src/plugin/Makefile.in
+++ b/embedding/browser/activex/src/plugin/Makefile.in
@@ -253,23 +253,16 @@ install-typelib: $(XPIDL_GEN_DIR)/nsIMoz
install-securitypolicy: nsAxSecurityPolicy.js
$(INSTALL) $< $(DIST)/bin/components
install-prefs: activex.js
$(INSTALL) $< $(DIST)/bin/defaults/pref
ifdef MOZ_USE_ACTIVEX_PLUGIN
-PACKAGE_FILE = axplugin.pkg
-PACKAGE_VARS += \
- MOZ_ACTIVEX_PLUGIN_LIVECONNECT \
- MOZ_ACTIVEX_PLUGIN_XPCONNECT \
- XPC_IDISPATCH_SUPPORT \
- $(NULL)
-
libs:: install-plugin install-prefs
ifdef MOZ_ACTIVEX_PLUGIN_LIVECONNECT
libs:: install-class
endif
ifdef MOZ_ACTIVEX_PLUGIN_XPCONNECT
libs:: install-typelib
deleted file mode 100644
--- a/embedding/browser/activex/src/plugin/axplugin.pkg
+++ /dev/null
@@ -1,13 +0,0 @@
-# XXXbsmedberg: god help me, this makefile is bizarre
-[gecko]
-dist/plugins/@SHARED_LIBRARY@
-dist/bin/defaults/pref/activex.js
-#if MOZ_ACTIVEX_PLUGIN_XPCONNECT
-!xpt dist/bin/plugins/nsIMozAxPlugin.xpt
-#endif
-#if MOZ_ACTIVEX_PLUGIN_LIVECONNECT
-dist/bin/plugins/MozAxPlugin.class
-#endif
-#if XPC_IDISPATCH_SUPPORT
-dist/bin/components/nsAxSecurityPolicy.js
-#endif
--- a/embedding/browser/build/Makefile.in
+++ b/embedding/browser/build/Makefile.in
@@ -46,18 +46,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = webbrwsr
LIBRARY_NAME = webbrwsr
IS_COMPONENT = 1
MODULE_NAME = Browser_Embedding_Module
EXPORT_LIBRARY = 1
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = webbrowser.pkg
-
REQUIRES = xpcom \
string \
docshell \
dom \
widget \
gfx \
content \
necko \
deleted file mode 100644
--- a/embedding/browser/build/webbrowser.pkg
+++ /dev/null
@@ -1,7 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/webBrowser_core.xpt
--- a/embedding/browser/gtk/Makefile.in
+++ b/embedding/browser/gtk/Makefile.in
@@ -46,11 +46,9 @@ include $(DEPTH)/config/autoconf.mk
MODULE = gtkembedmoz
DIRS=src
ifdef ENABLE_TESTS
TOOL_DIRS += tests
endif
-PACKAGE_FILE = gtkembed.pkg
-
include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/embedding/browser/gtk/gtkembed.pkg
+++ /dev/null
@@ -1,9 +0,0 @@
-[gtkembed]
-dist/bin/@DLLP@gtkembedmoz@DLLS@
-dist/bin/TestGtkEmbed
-
-#if ENABLE_TESTS
-dist/bin/TestGtkEmbedNotebook@BINS@
-dist/bin/TestGtkEmbedSocket@BINS@
-dist/bin/TestGtkEmbedChild@BINS@
-#endif
--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@@ -51,19 +51,16 @@ IS_COMPONENT = 1
MODULE_NAME = embedcomponents
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
ifdef MOZ_PERF_METRICS
EXTRA_DSO_LIBS = mozutil_s
endif
-PACKAGE_FILE = embedcomponents.pkg
-PACKAGE_VARS += MOZ_PROFILESHARING
-
REQUIRES = js \
xpcom \
string \
windowwatcher \
webbrwsr \
gfx \
widget \
webbrowserpersist \
deleted file mode 100644
--- a/embedding/components/build/embedcomponents.pkg
+++ /dev/null
@@ -1,23 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/commandhandler.xpt
-!xpt dist/bin/components/find.xpt
-!xpt dist/bin/components/jsconsole.xpt
-!xpt dist/bin/components/helperAppDlg.xpt
-!xpt dist/bin/components/progressDlg.xpt
-!xpt dist/bin/components/webbrowserpersist.xpt
-!xpt dist/bin/components/windowwatcher.xpt
-!xpt dist/bin/components/embed_base.xpt
-#if MOZ_PROFILESHARING
-!xpt dist/bin/components/profilesharingsetup.xpt
-#endif
-
-# embedders may want to ship these components also
-[xpfe-browser browser]
-dist/bin/components/nsHelperAppDlg.js
-dist/bin/components/nsProgressDialog.js
-!xpt dist/bin/components/helperAppDlg.xpt
--- a/embedding/components/printingui/src/mac/printpde/Makefile.in
+++ b/embedding/components/printingui/src/mac/printpde/Makefile.in
@@ -50,17 +50,16 @@ endif
# pbbuild or xcodebuild indicates Xcode; the Xcode project contains
# native targets needed for proper SDK builds.
PROJECT=PrintPDE.xcode
PROJECT_ARG=-project $(PROJECT)
PBBUILD_ARG=$(PBBUILD_SETTINGS)
MODULE = printpde
-PACKAGE_FILE = printpde.pkg
unexport CC CXX
ABS_topsrcdir := $(shell cd $(topsrcdir); pwd)
ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
export::
rsync -a --exclude .DS_Store --exclude "CVS/" $(srcdir)/$(PROJECT) .
ln -fs $(srcdir)/src
deleted file mode 100644
--- a/embedding/components/printingui/src/mac/printpde/printpde.pkg
+++ /dev/null
@@ -1,7 +0,0 @@
-[xpfe-browser]
-dist/package/PrintPDE.plugin/Contents/Info.plist approot/Plug-Ins/PrintPDE.plugin/Contents/Info.plist
-dist/package/PrintPDE.plugin/Contents/MacOS/PrintPDE approot/Plug-Ins/PrintPDE.plugin/Contents/MacOS/PrintPDE
-dist/package/PrintPDE.plugin/Contents/Resources/English.lproj/Localizable.strings approot/Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/Localizable.strings
-dist/package/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/classes.nib approot/Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/classes.nib
-dist/package/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/info.nib approot/Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/info.nib
-dist/package/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/objects.xib approot/Plug-Ins/PrintPDE.plugin/Contents/Resources/English.lproj/PrintPDE.nib/objects.xib
deleted file mode 100644
--- a/embedding/embed.pkg
+++ /dev/null
@@ -1,13 +0,0 @@
-# gre-support is also included by various embedding packages
-[gre-support]
-dist/bin/chrome/embed.jar
-@topsrcdir@/embedding/config/installed-chrome.txt dist/bin/chrome/installed-chrome.txt
-
-[gtkembed mfcembed winembed minimo]
-!touch dist/bin/.autoreg
-@topsrcdir@/embedding/config/readme.html dist/bin/readme.html
-!optional @topsrcdir@/embedding/config/all.js dist/bin/defaults/pref/all.js
-@topsrcdir@/embedding/config/installed-chrome.txt dist/bin/chrome/installed-chrome.txt
-
-[unpackaged-files]
-dist/bin/chrome/embed-sample.jar
--- a/embedding/tests/os2Embed/Makefile.in
+++ b/embedding/tests/os2Embed/Makefile.in
@@ -35,18 +35,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
PROGRAM = os2Embed$(BIN_SUFFIX)
RESFILE = os2Embed.res
MOZILLA_INTERNAL_API = 1
MODULE = os2Embed
-PACKAGE_FILE = os2embed.pkg
-
REQUIRES = xpcom \
string \
embed_base \
webbrwsr \
webshell \
windowwatcher \
profile \
necko \
deleted file mode 100644
--- a/embedding/tests/os2Embed/os2embed.pkg
+++ /dev/null
@@ -1,2 +0,0 @@
-[os2embed]
-dist/bin/os2Embed.exe
--- a/embedding/tests/winEmbed/Makefile.in
+++ b/embedding/tests/winEmbed/Makefile.in
@@ -36,18 +36,16 @@ include $(DEPTH)/config/autoconf.mk
XPI_NAME = winembed
PROGRAM = winEmbed$(BIN_SUFFIX)
RESFILE = winEmbed.res
MODULE = winEmbed
-PACKAGE_FILE = winembed.pkg
-
REQUIRES = xpcom \
string \
embed_base \
webbrwsr \
webshell \
windowwatcher \
profile \
necko \
deleted file mode 100644
--- a/embedding/tests/winEmbed/winembed.pkg
+++ /dev/null
@@ -1,2 +0,0 @@
-[winembed]
-dist/bin/winEmbed.exe
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@@ -45,18 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = cookie
LIBRARY_NAME = cookie
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsCookieModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = cookie.pkg
-
REQUIRES = xpcom \
string \
necko \
dom \
content \
widget \
pref \
windowwatcher \
deleted file mode 100644
--- a/extensions/cookie/cookie.pkg
+++ /dev/null
@@ -1,12 +0,0 @@
-[xpfe-browser browser gtkembed mfcembed winembed]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/cookie.xpt
-
-#if ENABLE_TESTS
-[gecko-tests]
-dist/bin/TestCookie@BINS@
-#endif
--- a/extensions/permissions/Makefile.in
+++ b/extensions/permissions/Makefile.in
@@ -44,18 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = permissions
LIBRARY_NAME = permissions
SHORT_LIBNAME = perms
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsPermissionsModule
LIBXUL_LIBRARY = 1
-#PACKAGE_FILE = permissions.pkg
-
REQUIRES = xpcom \
string \
necko \
dom \
widget \
content \
layout \
pref \
--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@@ -48,18 +48,16 @@ LIBRARY_NAME = autoconfig
ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = autocfg
endif
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsAutoConfigModule
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = autoconfig.pkg
-
REQUIRES = xpcom \
string \
intl \
js \
xpconnect \
necko \
profile \
pref \
deleted file mode 100644
--- a/extensions/pref/autoconfig/src/autoconfig.pkg
+++ /dev/null
@@ -1,13 +0,0 @@
-[xpfe-browser]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/autoconfig.xpt
-
-# odd place to put this, but...
-dist/bin/components/nsProxyAutoConfig.js
-
-dist/bin/defaults/autoconfig/prefcalls.js
-dist/bin/defaults/autoconfig/platform.js
--- a/extensions/universalchardet/src/xpcom/Makefile.in
+++ b/extensions/universalchardet/src/xpcom/Makefile.in
@@ -56,18 +56,16 @@ endif
LIBXUL_LIBRARY = 1
REQUIRES = xpcom \
string \
uconv \
chardet \
$(NULL)
-PACKAGE_FILE = universalchardet.pkg
-
CPPSRCS = \
nsUniversalCharDetModule.cpp \
nsUdetXPCOMWrapper.cpp \
$(NULL)
LOCAL_INCLUDES = -I$(srcdir)/../base
SHARED_LIBRARY_LIBS = \
deleted file mode 100644
--- a/extensions/universalchardet/src/xpcom/universalchardet.pkg
+++ /dev/null
@@ -1,14 +0,0 @@
-# This is not part of embedding, but it is part of the GRE.
-# Make that make sense.
-
-[gre]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-
-#if ENABLE_TESTS
-[gecko-tests]
-dist/bin/UniversalChardetTest@BINS@
-#endif
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -43,18 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = gfx
LIBRARY_NAME = gkgfx
EXPORT_LIBRARY = 1
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = gfx.pkg
-
REQUIRES = xpcom \
string \
widget \
locale \
view \
unicharutil \
thebes \
$(NULL)
deleted file mode 100644
--- a/gfx/src/gfx.pkg
+++ /dev/null
@@ -1,12 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/@SHARED_LIBRARY@
-#endif
-!xpt dist/bin/components/gfx.xpt
-
-#if ENABLE_TESTS
-[gecko-tests]
-dist/bin/DumpColors@BINS@
-dist/bin/TestColorNames@BINS@
-dist/bin/TestRect@BINS@
-#endif
--- a/gfx/src/psshared/Makefile.in
+++ b/gfx/src/psshared/Makefile.in
@@ -49,18 +49,16 @@ GRE_MODULE = 1
REQUIRES = pref \
string \
widget \
xpcom \
thebes \
$(NULL)
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = psshared.pkg
-
EXPORTS = nsCUPSShim.h \
nsPaperPS.h \
nsPSPrinters.h\
psSharedCore.h \
$(NULL)
CPPSRCS = nsCUPSShim.cpp \
nsPaperPS.cpp \
deleted file mode 100644
--- a/gfx/src/psshared/psshared.pkg
+++ /dev/null
@@ -1,4 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/@SHARED_LIBRARY@
-#endif
--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@@ -44,19 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = i18n
LIBRARY_NAME = i18n
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsI18nModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = intl.pkg
-PACKAGE_VARS = MOZ_MATHML
-
REQUIRES = xpcom \
string \
unicharutil \
uconv \
lwbrk \
intl \
locale \
$(NULL)
deleted file mode 100644
--- a/intl/build/intl.pkg
+++ /dev/null
@@ -1,31 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/intl.xpt
-!xpt dist/bin/components/unicharutil.xpt
-!xpt dist/bin/components/locale.xpt
-!xpt dist/bin/components/chardet.xpt
-!xpt dist/bin/components/lwbrk.xpt
-dist/bin/res/langGroups.properties
-dist/bin/res/language.properties
-dist/bin/res/entityTables/html40Special.properties
-dist/bin/res/entityTables/htmlEntityVersions.properties
-dist/bin/res/entityTables/html40Latin1.properties
-dist/bin/res/entityTables/html40Symbols.properties
-dist/bin/res/entityTables/transliterate.properties
-#if MOZ_MATHML
-dist/bin/res/entityTables/mathml20.properties
-#endif
-
-#if ENABLE_TESTS
-[gecko-tests]
-dist/bin/UnicharSelfTest@BINS@
-dist/bin/TestLineBreak@BINS@
-dist/bin/res/strres.properties
-#if OS_ARCH==WINNT
-dist/bin/DetectCharset@BINS@
-#endif
-#endif
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@@ -49,18 +49,16 @@ IS_COMPONENT = 1
MODULE_NAME = nsUConvModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
ifneq ($(OS_ARCH),WINNT)
# To avoid conflict with OS/2 system uconv.dll
SHORT_LIBNAME = mozuconv
endif
-PACKAGE_FILE = uconv.pkg
-
REQUIRES = xpcom \
string \
intl \
locale \
unicharutil \
necko \
$(NULL)
deleted file mode 100644
--- a/intl/uconv/src/uconv.pkg
+++ /dev/null
@@ -1,40 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/uconv.xpt
-!xpt dist/bin/components/ucnative.xpt
-dist/bin/res/charsetalias.properties
-dist/bin/res/charsetData.properties
-
-#if MOZ_WIDGET_TOOLKIT==os2
-dist/bin/res/os2charset.properties
-#else
-#if MOZ_WIDGET_TOOLKIT==windows
-dist/bin/res/wincharset.properties
-#else
-#if MOZ_WIDGET_TOOLKIT==mac
-dist/bin/res/maccharset.properties
-#else
-#if MOZ_WIDGET_TOOLKIT==cocoa
-dist/bin/res/maccharset.properties
-#else
-#if OS_ARCH!=BeOS
-dist/bin/res/unixcharset.properties
-#endif
-#endif
-#endif
-#endif
-#endif
-
-#if ENABLE_TESTS
-#if OS_ARCH==WINNT
-[gecko-tests]
-dist/bin/TestUConv@BINS@
-dist/bin/nsconv@BINS@
-dist/bin/plattest@BINS@
-dist/bin/convperf@BINS@
-#endif
-#endif
--- a/intl/uconv/ucvmath/Makefile.in
+++ b/intl/uconv/ucvmath/Makefile.in
@@ -46,18 +46,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = ucvmath
LIBRARY_NAME = ucvmath
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsUCvMathModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = ucvmath.pkg
-
REQUIRES = xpcom \
string \
uconv \
$(NULL)
LOCAL_INCLUDES = -I$(srcdir)/../util
CPPSRCS = \
deleted file mode 100644
--- a/intl/uconv/ucvmath/ucvmath.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
--- a/ipc/ipcd/Makefile.in
+++ b/ipc/ipcd/Makefile.in
@@ -40,18 +40,16 @@ DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = ipcd
-PACKAGE_FILE = ipc.pkg
-
DIRS = \
util \
shared/src \
daemon/public \
client/public \
extensions \
client/src \
daemon/src \
deleted file mode 100644
--- a/ipc/ipcd/ipc.pkg
+++ /dev/null
@@ -1,21 +0,0 @@
-[gecko]
-dist/bin/mozipcd@BINS@
-#if OS_ARCH==OS2
-dist/bin/ipc/modules/@DLLP@lockmod@DLLS@
-#else
-dist/bin/ipc/modules/@DLLP@lockmodule@DLLS@
-#endif
-dist/bin/ipc/modules/@DLLP@transmgr@DLLS@
-dist/bin/components/@DLLP@ipcdc@DLLS@
-!xpt dist/bin/components/ipcd.xpt
-
-#if ENABLE_TESTS
-[gecko-tests]
-dist/bin/TestIPC@BINS@
-dist/bin/tmModuleTest@BINS@
-#if USE_SHORT_LIBNAME
-dist/bin/ipc/modules/@DLLP@testmod@DLLS@
-#else
-dist/bin/ipc/modules/@DLLP@testmodule@DLLS@
-#endif
-#endif
--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -58,18 +58,16 @@ REQUIRES = js
ifndef JSD_STANDALONE
REQUIRES += \
string \
xpcom \
xpconnect \
widget \
dom \
$(NULL)
-
-PACKAGE_FILE = jsd.pkg
endif
EXTRA_DSO_LDOPTS += \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_JS_LIBS) \
$(NULL)
EXPORTS = jsdebug.h
deleted file mode 100644
--- a/js/jsd/jsd.pkg
+++ /dev/null
@@ -1,8 +0,0 @@
-# xxxbsmedberg: this should arguably be part of the GRE
-[xpfe-browser]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/jsdservice.xpt
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -85,18 +85,16 @@ endif
endif
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
LIBRARY_NAME = js$(MOZ_BITS)$(VERSION_NUMBER)
RESFILE = js$(MOZ_BITS)40.res
endif
-PACKAGE_FILE = js.pkg
-
# JavaScript must be built shared, even for static builds, as it is used by
# other modules which are always built shared. Failure to do so results in
# the js code getting copied into xpinstall and jsd as well as mozilla-bin,
# and then the static data cells used for locking no longer work.
ifndef JS_STATIC_BUILD
FORCE_SHARED_LIB = 1
endif
deleted file mode 100644
--- a/js/src/js.pkg
+++ /dev/null
@@ -1,2 +0,0 @@
-[gecko xpi-bootstrap]
-dist/bin/@SHARED_LIBRARY@
--- a/js/src/liveconnect/Makefile.in
+++ b/js/src/liveconnect/Makefile.in
@@ -49,18 +49,16 @@ EXPORT_LIBRARY = 1
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
LIBRARY_NAME = jsj$(MOZ_BITS)$(VERSION_NUMBER)
MAPFILE = $(LIBRARY_NAME).map
endif
JNI_GEN_DIR = _jni
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = liveconnect.pkg
-
REQUIRES = js \
xpcom \
xpconnect \
java \
caps \
necko \
string \
$(NULL)
deleted file mode 100644
--- a/js/src/liveconnect/liveconnect.pkg
+++ /dev/null
@@ -1,3 +0,0 @@
-# this is part of the GRE, but *not* part of the embedding packages
-[gre]
-dist/bin/@SHARED_LIBRARY@
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@@ -52,18 +52,16 @@ IS_COMPONENT = 1
MODULE_NAME = xpconnect
GRE_MODULE = 1
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
LIBRARY_NAME = xpc$(MOZ_BITS)$(VERSION_NUMBER)
SHORT_LIBNAME = xpc$(MOZ_BITS)$(VERSION_NUMBER)
endif
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = xpconnect.pkg
-
REQUIRES = xpcom \
string \
js \
caps \
necko \
dom \
$(NULL)
deleted file mode 100644
--- a/js/src/xpconnect/src/xpconnect.pkg
+++ /dev/null
@@ -1,19 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/xpconnect.xpt
-
-# xpcshell is one of those interesting apps that is useful in both an application
-# directory and in the plain-jane GRE
-[gecko gecko-support]
-dist/bin/xpcshell@BINS@
-
-#if ENABLE_TESTS
-[gecko-tests]
-dist/bin/TestXPC@BINS@
-dist/bin/components/@DLLP@xpctest@DLLS@
-!xpt dist/bin/components/xpconnect_tests.xpt
-#endif
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -53,19 +53,16 @@ endif
MODULE = layout
LIBRARY_NAME = gklayout
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsLayoutModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = layout.pkg
-PACKAGE_VARS += MOZ_XUL
-
ifndef MOZ_ENABLE_LIBXUL
EXTRA_DSO_LIBS = gkgfx
endif
EXTRA_DSO_LIBS += thebes
REQUIRES = xpcom \
string \
content \
deleted file mode 100644
--- a/layout/build/layout.pkg
+++ /dev/null
@@ -1,56 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/xuldoc.xpt
-!xpt dist/bin/components/layout_base.xpt
-!xpt dist/bin/components/layout_printing.xpt
-!xpt dist/bin/components/layout_xul.xpt
-!xpt dist/bin/components/content_base.xpt
-!xpt dist/bin/components/content_html.xpt
-!xpt dist/bin/components/content_htmldoc.xpt
-!xpt dist/bin/components/content_xmldoc.xpt
-!xpt dist/bin/components/content_xslt.xpt
-!xpt dist/bin/components/dom.xpt
-!xpt dist/bin/components/dom_base.xpt
-!xpt dist/bin/components/dom_core.xpt
-!xpt dist/bin/components/dom_css.xpt
-!xpt dist/bin/components/dom_events.xpt
-!xpt dist/bin/components/dom_geolocation.xpt
-!xpt dist/bin/components/dom_html.xpt
-!xpt dist/bin/components/dom_offline.xpt
-!xpt dist/bin/components/dom_range.xpt
-!xpt dist/bin/components/dom_stylesheets.xpt
-!xpt dist/bin/components/dom_traversal.xpt
-!xpt dist/bin/components/dom_views.xpt
-!xpt dist/bin/components/dom_xbl.xpt
-!xpt dist/bin/components/dom_xul.xpt
-!xpt dist/bin/components/dom_xpath.xpt
-#if MOZ_XUL
-!xpt dist/bin/components/xultmpl.xpt
-!xpt dist/bin/components/layout_xul_tree.xpt
-#endif
-dist/bin/res/html.css
-dist/bin/res/quirk.css
-dist/bin/res/viewsource.css
-dist/bin/res/forms.css
-dist/bin/res/contenteditable.css
-dist/bin/res/designmode.css
-dist/bin/res/arrow.gif
-dist/bin/res/arrowd.gif
-dist/bin/res/ua.css
-dist/bin/res/broken-image.gif
-dist/bin/res/loading-image.gif
-dist/bin/res/html/folder.png
-dist/bin/res/dtd/xhtml11.dtd
-
-[gecko-tests]
-dist/bin/bloaturls.txt
-dist/bin/res/bloatcycle.html
-#if ENABLE_TESTS
-dist/bin/TestSpaceManager@BINS@
-dist/bin/ParseCSS@BINS@
-dist/bin/TestCSSPropertyLookup@BINS@
-#endif
--- a/layout/mathml/base/src/Makefile.in
+++ b/layout/mathml/base/src/Makefile.in
@@ -43,18 +43,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = layout
LIBRARY_NAME = gkmathmlbase_s
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = mathml.pkg
-
REQUIRES = xpcom \
string \
dom \
content \
gfx \
thebes \
widget \
view \
deleted file mode 100644
--- a/layout/mathml/base/src/mathml.pkg
+++ /dev/null
@@ -1,11 +0,0 @@
-[gecko]
-dist/bin/res/mathml.css
-dist/bin/res/dtd/mathml.dtd
-dist/bin/res/fonts/mathfont.properties
-dist/bin/res/fonts/mathfontUnicode.properties
-dist/bin/res/fonts/mathfontSTIXNonUnicode.properties
-dist/bin/res/fonts/mathfontSTIXSize1.properties
-dist/bin/res/fonts/mathfontStandardSymbolsL.properties
-#if TARGET_MD_ARCH==win32
-dist/bin/res/fonts/mathfontSymbol.properties
-#endif
--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@@ -69,18 +69,16 @@ endif
MODULE = jar
LIBRARY_NAME = jar$(VERSION_NUMBER)
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsJarModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = libjar.pkg
-
REQUIRES = xpcom \
string \
caps \
mimetype \
js \
xpconnect \
necko \
$(ZLIB_REQUIRES) \
deleted file mode 100644
--- a/modules/libjar/libjar.pkg
+++ /dev/null
@@ -1,7 +0,0 @@
-[gecko xpi-bootstrap]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/jar.xpt
--- a/modules/libpr0n/build/Makefile.in
+++ b/modules/libpr0n/build/Makefile.in
@@ -45,18 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = imglib2
LIBRARY_NAME = imglib2
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsImageLib2Module
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = imglib2.pkg
-
REQUIRES = xpcom \
string \
thebes \
necko \
nkcache \
gfx \
caps \
$(JPEG_REQUIRES) \
deleted file mode 100644
--- a/modules/libpr0n/build/imglib2.pkg
+++ /dev/null
@@ -1,7 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/imglib2.xpt
--- a/modules/libpr0n/decoders/icon/Makefile.in
+++ b/modules/libpr0n/decoders/icon/Makefile.in
@@ -42,18 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = imgicon
LIBRARY_NAME = imgicon
IS_COMPONENT = 1
MODULE_NAME = nsIconDecoderModule
-PACKAGE_FILE = imgicon.pkg
-
ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
EXTRA_DSO_LDOPTS = $(MOZ_GTK2_LIBS)
PLATFORM = gtk
FORCE_SHARED_LIB = 1
else
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
endif
deleted file mode 100644
--- a/modules/libpr0n/decoders/icon/imgicon.pkg
+++ /dev/null
@@ -1,7 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/imgicon.xpt
deleted file mode 100644
--- a/modules/libpref/src/libpref.pkg
+++ /dev/null
@@ -1,52 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/pref.xpt
-
-#
-# all default pref files ship with the browser, to prevent
-# migration errors
-#
-[gecko-support]
-dist/bin/defaults/pref/all.js
-#if MOZ_WIDGET_TOOLKIT==mac
-dist/bin/defaults/pref/macprefs.js
-#else
-#if MOZ_WIDGET_TOOLKIT==cocoa
-dist/bin/defaults/pref/macprefs.js
-#else
-#if MOZ_WIDGET_TOOLKIT==windows
-dist/bin/defaults/pref/winpref.js
-#else
-#if MOZ_WIDGET_TOOLKIT==os2
-dist/bin/defaults/pref/os2pref.js
-#else
-#if MOZ_WIDGET_TOOLKIT==beos
-dist/bin/defaults/pref/beos.js
-#else
-dist/bin/defaults/pref/unix.js
-#if MOZ_WIDGET_TOOLKIT==photon
-dist/bin/defaults/pref/photon.js
-#endif
-#endif
-#endif
-#endif
-#endif
-#endif
-
-#if OS_ARCH==OpenVMS
-dist/bin/defaults/pref/openvms.js
-#elif OS_ARCH==AIX
-dist/bin/defaults/pref/aix.js
-#endif
-
-#if MOZ_PROFILESHARING
-dist/bin/defaults/pref/non-shared.txt
-#endif
-
-[xpfe-browser]
-dist/bin/defaults/pref/mailnews.js
-dist/bin/defaults/pref/editor.js
--- a/modules/libutil/public/Makefile.in
+++ b/modules/libutil/public/Makefile.in
@@ -40,15 +40,13 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = util
XPIDL_MODULE = util
-PACKAGE_FILE = libutil.pkg
-
EXPORTS = $(srcdir)/stopwatch.h \
$(srcdir)/nsTimer.h
include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/modules/libutil/public/libutil.pkg
+++ /dev/null
@@ -1,2 +0,0 @@
-[unpackaged-files]
-!xpt dist/bin/components/util.xpt
--- a/modules/oji/src/Makefile.in
+++ b/modules/oji/src/Makefile.in
@@ -43,18 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = oji
IS_COMPONENT = 1
MODULE_NAME = nsCJVMManagerModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = oji.pkg
-
REQUIRES = xpcom \
string \
liveconnect \
java \
js \
plugin \
caps \
pref \
deleted file mode 100644
--- a/modules/oji/src/oji.pkg
+++ /dev/null
@@ -1,8 +0,0 @@
-# this is part of the GRE, but *not* part of embedding packages
-[gre]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/oji.xpt
--- a/modules/plugin/base/src/Makefile.in
+++ b/modules/plugin/base/src/Makefile.in
@@ -46,19 +46,16 @@ MODULE = plugin
XPIDL_MODULE = layout
LIBRARY_NAME = gkplugin
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsPluginModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = plugin.pkg
-PACKAGE_VARS += MOZ_ENABLE_GTK
-
REQUIRES = xpcom \
xpconnect \
string \
java \
pref \
necko \
caps \
intl \
deleted file mode 100644
--- a/modules/plugin/base/src/plugin.pkg
+++ /dev/null
@@ -1,14 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/plugin.xpt
-
-[unpackaged-files]
-#if MOZ_ENABLE_GTK
-#if ENABLE_TESTS
-dist/bin/res/samples/embed-test.html
-#endif
-#endif
--- a/modules/plugin/default/os2/Makefile.in
+++ b/modules/plugin/default/os2/Makefile.in
@@ -42,18 +42,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = plugin
LIBRARY_NAME = npnulos2
RESFILE = npnulos2.res
-PACKAGE_FILE = npnul.pkg
-
REQUIRES = java \
xpcom \
pref \
$(NULL)
CPPSRCS = \
maindll.cpp \
plugin.cpp \
deleted file mode 100644
--- a/modules/plugin/default/os2/npnul.pkg
+++ /dev/null
@@ -1,4 +0,0 @@
-# the null plugin goes in gecko-support because we search for plugins
-# in the application, not the GRE
-[gecko-support]
-dist/bin/plugins/@SHARED_LIBRARY@
--- a/modules/plugin/default/unix/Makefile.in
+++ b/modules/plugin/default/unix/Makefile.in
@@ -41,18 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = plugin
LIBRARY_NAME = nullplugin
GRE_MODULE = 1
-PACKAGE_FILE = npnul.pkg
-
REQUIRES = java \
$(NULL)
CSRCS = \
npshell.c\
nullplugin.c\
npunix.c\
$(NULL)
deleted file mode 100644
--- a/modules/plugin/default/unix/npnul.pkg
+++ /dev/null
@@ -1,40 +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 *****
-#
-# the null plugin goes in gecko-support because we search for plugins
-# in the application, not the GRE
-[gecko-support]
-dist/bin/plugins/@SHARED_LIBRARY@
--- a/modules/plugin/default/windows/Makefile.in
+++ b/modules/plugin/default/windows/Makefile.in
@@ -43,18 +43,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = plugin
LIBRARY_NAME = npnul32
RESFILE = npnul32.res
DEFFILE = $(win_srcdir)/npnul32.def
GRE_MODULE = 1
-PACKAGE_FILE = npnul.pkg
-
REQUIRES = java \
xpcom \
pref \
$(NULL)
CPPSRCS = \
maindll.cpp \
plugin.cpp \
deleted file mode 100644
--- a/modules/plugin/default/windows/npnul.pkg
+++ /dev/null
@@ -1,4 +0,0 @@
-# the null plugin goes in gecko-support because we search for plugins
-# in the application, not the GRE
-[gecko-support]
-dist/bin/plugins/@SHARED_LIBRARY@
--- a/modules/plugin/sdk/samples/unixprinting/Makefile.in
+++ b/modules/plugin/sdk/samples/unixprinting/Makefile.in
@@ -41,18 +41,16 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = plugin
LIBRARY_NAME = unixprintplugin
GRE_MODULE = 1
-PACKAGE_FILE = npprint.pkg
-
REQUIRES = java \
$(NULL)
CSRCS = \
npshell.c \
printplugin.c \
npunix.c \
$(NULL)
deleted file mode 100644
--- a/modules/plugin/sdk/samples/unixprinting/npprint.pkg
+++ /dev/null
@@ -1,41 +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
-# Dantifer Dang <dantifer.dang@sun.com>.
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Roland Mainz <roland.mainz@nrubsig.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 *****
-#
-# the print plugin goes in gecko-support because we search for plugins
-# in the application, not the GRE
-[gecko-support]
-dist/bin/plugins/@SHARED_LIBRARY@
--- a/modules/zlib/src/Makefile.in
+++ b/modules/zlib/src/Makefile.in
@@ -44,18 +44,16 @@ include $(DEPTH)/config/autoconf.mk
include $(srcdir)/objs.mk
MODULE = zlib
LIBRARY_NAME = mozz
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
DIST_INSTALL = 1
-PACKAGE_FILE = zlib.pkg
-
ifndef MOZ_ENABLE_LIBXUL
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
ifndef GNU_CC
MAPFILE = $(LIBRARY_NAME).map
DEFFILE = $(win_srcdir)/zlib.def
endif
endif
endif
deleted file mode 100644
--- a/modules/zlib/src/zlib.pkg
+++ /dev/null
@@ -1,4 +0,0 @@
-[gecko xpi-bootstrap]
-#if SHARED_LIBRARY
-dist/bin/@SHARED_LIBRARY@
-#endif
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -45,22 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = necko
LIBRARY_NAME = necko
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = necko
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = necko.pkg
-
-ifdef ENABLE_TESTS
-PACKAGE_FILE += necko-tests.pkg
-endif
-
REQUIRES = xpcom \
string \
nkcache \
pref \
mimetype \
locale \
intl \
uconv \
deleted file mode 100644
--- a/netwerk/build/necko-tests.pkg
+++ /dev/null
@@ -1,23 +0,0 @@
-[gecko-tests]
-dist/bin/TestStreamConv@BINS@
-dist/bin/TestStreamChannel@BINS@
-dist/bin/PropertiesTest@BINS@
-dist/bin/urltest@BINS@
-dist/bin/TestCallbacks@BINS@
-dist/bin/TestPageLoad@BINS@
-dist/bin/TestPerf@BINS@
-dist/bin/TestIDN@BINS@
-dist/bin/TestURLParser@BINS@
-dist/bin/TestStandardURL@BINS@
-dist/bin/TestSocketTransport@BINS@
-dist/bin/TestUpload@BINS@
-dist/bin/TestStreamTransport@BINS@
-dist/bin/TestStreamPump@BINS@
-dist/bin/TestProtocols@BINS@
-dist/bin/TestBlockingSocket@BINS@
-dist/bin/TestDNS@BINS@
-dist/bin/TestIOThreads@BINS@
-
-dist/bin/res/urlparse.dat
-dist/bin/res/urlparse_unx.dat
-dist/bin/res/jarlist.dat
deleted file mode 100644
--- a/netwerk/build/necko.pkg
+++ /dev/null
@@ -1,25 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/necko.xpt
-!xpt dist/bin/components/necko_about.xpt
-!xpt dist/bin/components/necko_cookie.xpt
-!xpt dist/bin/components/necko_dns.xpt
-!xpt dist/bin/components/necko_file.xpt
-!xpt dist/bin/components/necko_ftp.xpt
-!xpt dist/bin/components/necko_http.xpt
-!xpt dist/bin/components/necko_res.xpt
-!xpt dist/bin/components/necko_strconv.xpt
-!xpt dist/bin/components/necko_cache.xpt
-!xpt dist/bin/components/mimetype.xpt
-
-# xxxbsmedberg : why don't we generate/ship this on win32?
-#if OS_ARCH!=WINNT
-!xpt dist/bin/components/necko_socket.xpt
-#endif
-
-[gecko-support]
-dist/bin/defaults/pref/security-prefs.js
--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@@ -45,18 +45,16 @@ MODULE = htmlparser
LIBRARY_NAME = htmlpars
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsParserModule
SHORT_LIBNAME = gkparser
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = parser.pkg
-
REQUIRES = xpcom \
string \
necko \
util \
uconv \
unicharutil \
expat \
xml \
deleted file mode 100644
--- a/parser/htmlparser/src/parser.pkg
+++ /dev/null
@@ -1,42 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/htmlparser.xpt
-
-#if ENABLE_TESTS
-[gecko-tests]
-dist/bin/htmlrobot@BINS@
-dist/bin/TestOutput@BINS@
-dist/bin/TestOutSinks.pl
-dist/bin/grabpage@BINS@
-dist/bin/TestParser@BINS@
-
-#if OS_ARCH==WINNT
-dist/bin/@DLLP@dbgrobot@DLLS@
-#else
-dist/bin/@DLLP@DebugRobot@DLLS@
-#endif
-
-dist/bin/OutTestData/plain.html
-dist/bin/OutTestData/plainwrap.out
-dist/bin/OutTestData/plainnowrap.out
-dist/bin/OutTestData/simple.html
-dist/bin/OutTestData/simplecopy.out
-dist/bin/OutTestData/simplefmt.out
-dist/bin/OutTestData/entityxif.xif
-dist/bin/OutTestData/entityxif.out
-dist/bin/OutTestData/mailquote.html
-dist/bin/OutTestData/mailquote.out
-dist/bin/OutTestData/htmltable.html
-dist/bin/OutTestData/htmltable.out
-dist/bin/OutTestData/xifstuff.xif
-dist/bin/OutTestData/xifstuff.out
-dist/bin/OutTestData/doctype.xif
-dist/bin/OutTestData/xifdtplain.out
-dist/bin/OutTestData/xifdthtml.out
-dist/bin/OutTestData/simplemail.html
-dist/bin/OutTestData/simplemail.out
-#endif
--- a/profile/pref-migrator/src/Makefile.in
+++ b/profile/pref-migrator/src/Makefile.in
@@ -44,18 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = prefmigr
LIBRARY_NAME = nsprefm
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsPrefMigrationModule
MOZILLA_INTERNAL_API = 1
-PACKAGE_FILE = prefmigr.pkg
-
REQUIRES = xpcom \
xpcom_obsolete \
string \
pref \
intl \
docshell \
dom \
layout \
deleted file mode 100644
--- a/profile/pref-migrator/src/prefmigr.pkg
+++ /dev/null
@@ -1,8 +0,0 @@
-# xxxbsmedberg does firebird actually use this? It's currently shipping.
-[xpfe-browser browser]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/prefmigr.xpt
--- a/rdf/build/Makefile.in
+++ b/rdf/build/Makefile.in
@@ -46,18 +46,16 @@ MODULE = rdf
LIBRARY_NAME = rdf
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsRDFModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = rdf.pkg
-
EXTRA_DSO_LIBS =
REQUIRES = xpcom \
string \
content \
htmlparser \
necko \
$(NULL)
deleted file mode 100644
--- a/rdf/build/rdf.pkg
+++ /dev/null
@@ -1,29 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/rdf.xpt
-
-#if ENABLE_TESTS
-[gecko-tests]
-dist/bin/rdfcat@BINS@
-dist/bin/rdfpoll@BINS@
-
-dist/bin/res/rdf/article.gif
-dist/bin/res/rdf/document.gif
-dist/bin/res/rdf/folder-closed.gif
-dist/bin/res/rdf/folder-open.gif
-dist/bin/res/rdf/loading.gif
-dist/bin/res/rdf/dom-test-1.xul
-dist/bin/res/rdf/dom-test-2.xul
-dist/bin/res/rdf/dom-test-3.xul
-dist/bin/res/rdf/dom-test-4.css
-dist/bin/res/rdf/dom-test-4.xul
-dist/bin/res/rdf/dom-test-5.xul
-dist/bin/res/rdf/dom-test-6.xul
-dist/bin/res/rdf/dom-test-7.xul
-dist/bin/res/rdf/dom-test-8.xul
-dist/bin/res/rdf/ignore-test.xul
-dist/bin/res/rdf/xpidl-test-1.xul
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -40,34 +40,17 @@ DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = psm
-PACKAGE_FILE = psm.pkg
-
ifndef MOZ_NATIVE_NSS
-PACKAGE_VARS += \
- NSS3_LIB \
- NSSUTIL3_LIB \
- SMIME3_LIB \
- SSL3_LIB \
- SOFTOKEN3_LIB \
- SOFTOKEN3_CHK \
- NSSDBM3_LIB \
- LOADABLE_ROOT_MODULE \
- HAVE_FREEBL_LIBS \
- HAVE_FREEBL_LIBS_32 \
- HAVE_FREEBL_LIBS_32INT64 \
- HAVE_FREEBL_LIBS_64 \
- $(NULL)
-
LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
endif
NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
NSSUTIL3_LIB = $(DLL_PREFIX)nssutil3$(DLL_SUFFIX)
SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX)
SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX)
--- a/security/manager/boot/src/Makefile.in
+++ b/security/manager/boot/src/Makefile.in
@@ -48,18 +48,16 @@ MODULE = pipboot
LIBRARY_NAME = pipboot
IS_COMPONENT = 1
MODULE_NAME = BOOT
EXPORT_LIBRARY = 1
META_COMPONENT = crypto
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = pipboot.pkg
-
CPPSRCS = \
nsEntropyCollector.cpp \
nsSecureBrowserUIImpl.cpp \
nsBOOTModule.cpp \
nsSecurityWarningDialogs.cpp \
$(NULL)
REQUIRES = nspr \
deleted file mode 100644
--- a/security/manager/boot/src/pipboot.pkg
+++ /dev/null
@@ -1,8 +0,0 @@
-[psm]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-
-!xpt dist/bin/components/pipboot.xpt
--- a/security/manager/pki/src/Makefile.in
+++ b/security/manager/pki/src/Makefile.in
@@ -49,18 +49,16 @@ MODULE = pippki
LIBRARY_NAME = pippki
IS_COMPONENT = 1
MODULE_NAME = PKI
EXPORT_LIBRARY = 1
META_COMPONENT = crypto
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = pippki.pkg
-
CPPSRCS = \
nsNSSDialogs.cpp \
nsPKIModule.cpp \
nsPKIParamBlock.cpp \
nsASN1Tree.cpp \
nsNSSDialogHelper.cpp \
nsFormSigningDialog.cpp \
$(NULL)
deleted file mode 100644
--- a/security/manager/pki/src/pippki.pkg
+++ /dev/null
@@ -1,10 +0,0 @@
-[psm]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/pippki.xpt
-
-[psm-support]
-dist/bin/chrome/pippki.jar
deleted file mode 100644
--- a/security/manager/psm.pkg
+++ /dev/null
@@ -1,56 +0,0 @@
-[nss]
-dist/bin/@NSS3_LIB@
-dist/bin/@SMIME3_LIB@
-dist/bin/@SSL3_LIB@
-dist/bin/@SOFTOKEN3_LIB@
-dist/bin/@LOADABLE_ROOT_MODULE@
-#if HAVE_FREEBL_LIBS
-dist/bin/libfreebl3@DLLS@
-#endif
-#if HAVE_FREEBL_LIBS_32
-dist/bin/libfreebl_32fpu_3@DLLS@
-dist/bin/libfreebl_32int_3@DLLS@
-#endif
-#if HAVE_FREEBL_LIBS_32INT64
-dist/bin/libfreebl_32int64_3@DLLS@
-#endif
-#if HAVE_FREEBL_LIBS_64
-dist/bin/libfreebl_64fpu_3@DLLS@
-dist/bin/libfreebl_64int_3@DLLS@
-#endif
-
-# when these files are packaged they should be re-signed
-# see bug 200775
-!exec
-#if OS_ARCH!=WINNT
-#if OS_ARCH!=OS2
-!= export LIBRARY_PATH=dist/bin:${LD_LIBRARY_PATH}
-!= export LD_LIBRARYN32_PATH=dist/bin:${LD_LIBRARYN32_PATH} ;
-!= export LD_LIBRARYN64_PATH=dist/bin:${LD_LIBRARYN64_PATH} ;
-!= export LD_LIBRARY_PATH_64=dist/bin:${LD_LIBRARY_PATH_64} ;
-!= export SHLIB_PATH=dist/bin:${SHLIB_PATH} ;
-!= export LIBPATH=dist/bin:${LIBPATH} ;
-!= export DYLD_LIBRARY_PATH=dist/bin:${DYLD_LIBRARY_PATH} ;
-!= export LIBRARY_PATH=dist/bin:${LIBRARY_PATH} ;
-#endif
-#endif
-!= dist/bin/shlibsign -v -i %dist/bin/@SOFTOKEN3_LIB@% ;
-#if HAVE_FREEBL_LIBS
-!= dist/bin/shlibsign -v -i %dist/bin/libfreebl3@DLLS@% ;
-#endif
-#if HAVE_FREEBL_LIBS_32
-!= dist/bin/shlibsign -v -i %dist/bin/libfreebl_32fpu_3@DLLS@% ;
-!= dist/bin/shlibsign -v -i %dist/bin/libfreebl_32int_3@DLLS@% ;
-#endif
-#if HAVE_FREEBL_LIBS_32INT64
-!= dist/bin/shlibsign -v -i %dist/bin/libfreebl_32int64_3@DLLS@% ;
-#endif
-#if HAVE_FREEBL_LIBS_64
-!= dist/bin/shlibsign -v -i %dist/bin/libfreebl_64fpu_3@DLLS@% ;
-!= dist/bin/shlibsign -v -i %dist/bin/libfreebl_64int_3@DLLS@% ;
-#endif
-
-[unpackaged-files]
-dist/bin/shlibsign@BINS@
-!optional dist/bin/mangle@BINS@
-dist/bin/@SOFTOKEN3_CHK@
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -49,18 +49,16 @@ MODULE = pipnss
LIBRARY_NAME = pipnss
IS_COMPONENT = 1
MODULE_NAME = NSS
EXPORT_LIBRARY = 1
META_COMPONENT = crypto
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = pipnss.pkg
-
CPPSRCS = \
nsNSSCleaner.cpp \
nsCertOverrideService.cpp \
nsRecentBadCerts.cpp \
nsPSMBackgroundThread.cpp \
nsSSLThread.cpp \
nsCertVerificationThread.cpp \
nsCipherInfo.cpp \
deleted file mode 100644
--- a/security/manager/ssl/src/pipnss.pkg
+++ /dev/null
@@ -1,11 +0,0 @@
-[psm]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-
-!xpt dist/bin/components/pipnss.xpt
-
-[psm-support]
-dist/bin/chrome/pipnss.jar
--- a/toolkit/components/filepicker/src/Makefile.in
+++ b/toolkit/components/filepicker/src/Makefile.in
@@ -47,18 +47,16 @@ 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
-PACKAGE_FILE = filepicker.pkg
-
REQUIRES = \
xpcom \
layout \
dom \
string \
locale \
autocomplete \
$(NULL)
deleted file mode 100644
--- a/toolkit/components/filepicker/src/filepicker.pkg
+++ /dev/null
@@ -1,8 +0,0 @@
-[xpfe-browser browser mail]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-dist/bin/components/nsFilePicker.js
-!xpt dist/bin/components/filepicker.xpt
--- a/toolkit/components/typeaheadfind/src/Makefile.in
+++ b/toolkit/components/typeaheadfind/src/Makefile.in
@@ -42,18 +42,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = fastfind
LIBRARY_NAME = fastfind_s
GRE_MODULE = 1
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = typeaheadfind.pkg
-
REQUIRES = content \
docshell \
dom \
editor \
find \
gfx \
thebes \
layout \
--- a/webshell/public/Makefile.in
+++ b/webshell/public/Makefile.in
@@ -40,20 +40,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = webshell
XPIDL_MODULE = webshell_idls
-PACKAGE_FILE = webshell.pkg
-PACKAGE_VARS += \
- $(NULL)
-
SDK_XPIDLSRCS = \
nsIClipboardCommands.idl \
$(NULL)
XPIDLSRCS = \
nsIRefreshURI.idl \
nsIContentViewerContainer.idl \
nsIDocumentLoaderFactory.idl \
deleted file mode 100644
--- a/webshell/public/webshell.pkg
+++ /dev/null
@@ -1,12 +0,0 @@
-[gecko]
-!xpt dist/bin/components/webshell_idls.xpt
-
-#if ENABLE_TESTS
-[gecko-tests]
-dist/bin/viewer@BINS@
-#if OS_ARCH!=OS2
-#if OS_ARCH!=WINNT
-dist/bin/mozilla-viewer.sh
-#endif
-#endif
-#endif
--- a/widget/src/Makefile.in
+++ b/widget/src/Makefile.in
@@ -39,25 +39,16 @@ DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = widget
-PACKAGE_FILE = widget.pkg
-PACKAGE_VARS += \
- MOZ_ENABLE_GTK2 \
- MOZ_ENABLE_QT \
- MOZ_ENABLE_XLIB \
- MOZ_ENABLE_PHOTON \
- MOZ_ENABLE_XREMOTE \
- $(NULL)
-
DIRS = xpwidgets support
ifneq (,$(filter beos os2 mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
DIRS += $(MOZ_WIDGET_TOOLKIT)
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
DIRS += windows build
--- a/widget/src/beos/Makefile.in
+++ b/widget/src/beos/Makefile.in
@@ -45,18 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = widget
LIBRARY_NAME = widget_beos
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsWidgetBeOSModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = widget_beos.pkg
-
REQUIRES = xpcom \
string \
webshell \
appshell \
docshell \
gfx \
layout \
content \
deleted file mode 100644
--- a/widget/src/beos/widget_beos.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
--- a/widget/src/build/Makefile.in
+++ b/widget/src/build/Makefile.in
@@ -45,18 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = widget
LIBRARY_NAME = gkwidget
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
RESFILE = widget.res
MODULE_NAME = nsWidgetModule
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = widget_win.pkg
-
REQUIRES = xpcom \
string \
necko \
uconv \
gfx \
dom \
timer \
accessibility \
deleted file mode 100644
--- a/widget/src/build/widget_win.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
deleted file mode 100644
--- a/widget/src/cocoa/widget_cocoa.pkg
+++ /dev/null
@@ -1,7 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/widget_mac.xpt
--- a/widget/src/gtk2/Makefile.in
+++ b/widget/src/gtk2/Makefile.in
@@ -45,18 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = widget
LIBRARY_NAME = widget_gtk2
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsWidgetGtk2Module
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = widget_gtk2.pkg
-
NATIVE_THEME_SUPPORT = 1
REQUIRES = xpcom \
string \
gfx \
pref \
dom \
docshell \
deleted file mode 100644
--- a/widget/src/gtk2/widget_gtk2.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
--- a/widget/src/gtkxtbin/Makefile.in
+++ b/widget/src/gtkxtbin/Makefile.in
@@ -44,18 +44,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = gtkxtbin
LIBRARY_NAME = gtkxtbin
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = gtkxtbin.pkg
-
ifdef MOZ_ENABLE_GTK2
CSRCS = \
gtk2xtbin.c \
$(NULL)
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XT_LIBS) $(XLIBS)
endif
EXPORTS = gtkxtbin.h gtk2xtbin.h
deleted file mode 100644
--- a/widget/src/gtkxtbin/gtkxtbin.pkg
+++ /dev/null
@@ -1,4 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/@SHARED_LIBRARY@
-#endif
--- a/widget/src/os2/Makefile.in
+++ b/widget/src/os2/Makefile.in
@@ -46,18 +46,16 @@ MODULE = widget
LIBRARY_NAME = wdgtos2
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
RESFILE = widget.res
MODULE_NAME = nsWidgetOS2Module
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = widget_os2.pkg
-
REQUIRES = gfx \
xpcom \
string \
dom \
necko \
uconv \
intl \
pref \
deleted file mode 100644
--- a/widget/src/os2/widget_os2.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
deleted file mode 100644
--- a/widget/src/widget.pkg
+++ /dev/null
@@ -1,2 +0,0 @@
-[gecko]
-!xpt dist/bin/components/widget.xpt
deleted file mode 100644
--- a/widget/src/xremoteclient/xremoteclient.pkg
+++ /dev/null
@@ -1,8 +0,0 @@
-[xpfe-browser browser mail]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-
-dist/bin/mozilla-xremote-client
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -50,23 +50,16 @@ MODULE = xpcom
LIBRARY_NAME = xpcom_core
ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
SHORT_LIBNAME = xpcomcor
endif
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = xpcom.pkg
-PACKAGE_VARS += USE_SHORT_LIBNAME
-
-ifdef ENABLE_TESTS
-PACKAGE_FILE += xpcom-tests.pkg
-endif
-
# This is only a static library in libxul builds
ifdef MOZ_ENABLE_LIBXUL
EXPORT_LIBRARY = 1
endif
GRE_MODULE = 1
MOZILLA_INTERNAL_API = 1
deleted file mode 100644
--- a/xpcom/build/xpcom-tests.pkg
+++ /dev/null
@@ -1,47 +0,0 @@
-[xpcom-tests]
-#if USE_SHORT_LIBNAME
-dist/bin/components/@DLLP@tdynamic@DLLS@
-dist/bin/components/@DLLP@MyServce@DLLS@
-dist/bin/components/@DLLP@xpcomsmp@DLLS@
-#else
-dist/bin/components/@DLLP@testdynamic@DLLS@
-dist/bin/components/@DLLP@MyService@DLLS@
-dist/bin/components/@DLLP@xpcomsample@DLLS@
-#endif
-dist/bin/components/nsSample.js
-!xpt dist/bin/components/xpcomsample.xpt
-dist/bin/nsTestSample@BINS@
-dist/bin/res/test.properties
-dist/bin/res/samples/xpconnect-sample.html
-!xpt dist/bin/components/proxytest.xpt
-dist/bin/proxytests@BINS@
-
-dist/bin/PrimitiveTest@BINS@
-dist/bin/SimpleTypeLib@BINS@
-dist/bin/TestInterfaceInfo@BINS@
-dist/bin/TestXPTCInvoke@BINS@
-
-dist/bin/nsIFileEnumerator@BINS@
-dist/bin/nsIFileTest@BINS@
-dist/bin/TestArray@BINS@
-dist/bin/TestAtoms@BINS@
-dist/bin/TestAutoLock@BINS@
-dist/bin/TestCallTemplates@BINS@
-dist/bin/TestCOMPtr@BINS@
-dist/bin/TestCOMPtrEq@BINS@
-dist/bin/TestCRT@BINS@
-dist/bin/TestFactory@BINS@
-dist/bin/TestHashtables@BINS@
-dist/bin/TestID@BINS@
-dist/bin/TestObserverService@BINS@
-dist/bin/TestPermanentAtoms@BINS@
-dist/bin/TestPipes@BINS@
-dist/bin/TestServMgr@BINS@
-dist/bin/TestThreads@BINS@
-dist/bin/TestXPIDLString@BINS@
-dist/bin/TestDeque@BINS@
-dist/bin/TestAutoPtr@BINS@
-
-#if OS_ARCH==WINNT
-dist/bin/TestCOM.exe
-#endif
deleted file mode 100644
--- a/xpcom/build/xpcom.pkg
+++ /dev/null
@@ -1,102 +0,0 @@
-[xpcom]
-dist/bin/@DLLP@xpcom@DLLS@
-!xpt dist/bin/components/xpcom_base.xpt
-!xpt dist/bin/components/xpcom_components.xpt
-!xpt dist/bin/components/xpcom_ds.xpt
-!xpt dist/bin/components/xpcom_io.xpt
-!xpt dist/bin/components/xpcom_xpti.xpt
-
-#if OS_ARCH==WINNT
-!xpt dist/bin/components/xpcom_thread.xpt
-!xpt dist/bin/components/proxyObject.xpt
-#else
-!xpt dist/bin/components/xpcom_threads.xpt
-!xpt dist/bin/components/proxyObjInst.xpt
-#endif
-
-[gecko-support]
-dist/bin/regxpcom@BINS@
-dist/bin/xpt_dump@BINS@
-dist/bin/xpt_link@BINS@
-#if MOZ_DEBUG
-#if OS_ARCH==WINNT
-dist/bin/windbgdlg.exe
-#endif
-#endif
-
-# xpidl.exe is not licensed MPL, so we don't include it with applications.
-# It is only included in the developer (SDK) packages.
-[gecko-devel]
-dist/bin/xpidl@BINS@
-
-# put NSPR here, because hacking the NSPR build system is too painful
-# xxxbsmedberg: this doesn't obey --with-system-nspr
-[nspr]
-dist/bin/@DLLP@nspr4@DLLS@
-dist/bin/@DLLP@plc4@DLLS@
-dist/bin/@DLLP@plds4@DLLS@
-
-[nspr-devel]
-dist/lib/@LIBP@nspr4@LIBS@
-dist/lib/@LIBP@plc4@LIBS@
-dist/lib/@LIBP@plds4@LIBS@
-dist/include/nspr/private/pprio.h
-dist/include/nspr/private/pprthred.h
-dist/include/nspr/private/prpriv.h
-dist/include/nspr/prcpucfg.h
-dist/include/nspr/obsolete/pralarm.h
-dist/include/nspr/obsolete/probslet.h
-dist/include/nspr/obsolete/protypes.h
-dist/include/nspr/obsolete/prsem.h
-dist/include/nspr/nspr.h
-dist/include/nspr/pratom.h
-dist/include/nspr/prbit.h
-dist/include/nspr/prclist.h
-dist/include/nspr/prcmon.h
-dist/include/nspr/prcountr.h
-dist/include/nspr/prcvar.h
-dist/include/nspr/prdtoa.h
-dist/include/nspr/prenv.h
-dist/include/nspr/prerr.h
-dist/include/nspr/prerror.h
-dist/include/nspr/prinet.h
-dist/include/nspr/prinit.h
-dist/include/nspr/prinrval.h
-dist/include/nspr/prio.h
-dist/include/nspr/pripcsem.h
-dist/include/nspr/prlink.h
-dist/include/nspr/prlock.h
-dist/include/nspr/prlog.h
-dist/include/nspr/prlong.h
-dist/include/nspr/prmem.h
-dist/include/nspr/prmon.h
-dist/include/nspr/prmwait.h
-dist/include/nspr/prnetdb.h
-dist/include/nspr/prolock.h
-dist/include/nspr/prpdce.h
-dist/include/nspr/prprf.h
-dist/include/nspr/prproces.h
-dist/include/nspr/prrng.h
-dist/include/nspr/prrwlock.h
-dist/include/nspr/prshma.h
-dist/include/nspr/prshm.h
-dist/include/nspr/prsystem.h
-dist/include/nspr/prthread.h
-dist/include/nspr/prtime.h
-dist/include/nspr/prtpool.h
-dist/include/nspr/prtrace.h
-dist/include/nspr/prtypes.h
-dist/include/nspr/prvrsion.h
-dist/include/nspr/plarenas.h
-dist/include/nspr/plarena.h
-dist/include/nspr/plhash.h
-dist/include/nspr/plbase64.h
-dist/include/nspr/plerror.h
-dist/include/nspr/plgetopt.h
-dist/include/nspr/plresolv.h
-dist/include/nspr/plstr.h
-
-[unpackaged-files]
-!optional dist/bin/.autoreg
-!optional dist/bin/components/xpti.dat
-!optional dist/bin/components/compreg.dat
--- a/xpcom/obsolete/Makefile.in
+++ b/xpcom/obsolete/Makefile.in
@@ -45,17 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = xpcom_obsolete
LIBRARY_NAME = xpcom_compat
ifneq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
SHORT_LIBNAME = xpcomct
endif
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = xpcomobsolete.pkg
DIRS = component
REQUIRES = xpcom \
string \
$(NULL)
# pull in MoreFiles for MacOSX
--- a/xpcom/obsolete/component/Makefile.in
+++ b/xpcom/obsolete/component/Makefile.in
@@ -49,18 +49,16 @@ ifneq ($(OS_ARCH),WINNT)
SHORT_LIBNAME = xpcomctc
endif
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = xpcomobsoletec.pkg
-
REQUIRES = xpcom \
xpcom_obsolete \
string \
libreg \
$(NULL)
CPPSRCS = \
nsXPCOMObsolete.cpp \
deleted file mode 100644
--- a/xpcom/obsolete/component/xpcomobsoletec.pkg
+++ /dev/null
@@ -1,6 +0,0 @@
-[gecko xpi-bootstrap]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
deleted file mode 100644
--- a/xpcom/obsolete/xpcomobsolete.pkg
+++ /dev/null
@@ -1,7 +0,0 @@
-[gecko xpi-bootstrap]
-#if SHARED_LIBRARY
-dist/bin/@SHARED_LIBRARY@
-#endif
-
-[gecko]
-!xpt dist/bin/components/xpcom_obsolete.xpt
--- a/xpfe/Makefile.in
+++ b/xpfe/Makefile.in
@@ -38,18 +38,16 @@
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = browser
-PACKAGE_FILE = xpfe.pkg
-PACKAGE_VARS = USE_SHORT_LIBNAME
ifndef MOZ_SUNBIRD
DIRS += browser
endif
# Because of our great use of encapsulation, there are
# some header file in xpfe/components that are required
# by layout and the dom. This MOZ_XPFE_COMPONENTS, if
--- a/xpfe/appshell/src/Makefile.in
+++ b/xpfe/appshell/src/Makefile.in
@@ -46,18 +46,16 @@ IS_COMPONENT=1
MODULE_NAME = appshell
MODULE = appshell
LIBRARY_NAME = nsappshell
EXPORT_LIBRARY = 1
SHORT_LIBNAME = appshell
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = appshell.pkg
-
REQUIRES = xpcom \
string \
widget \
docshell \
webshell \
gfx \
thebes \
layout \
deleted file mode 100644
--- a/xpfe/appshell/src/appshell.pkg
+++ /dev/null
@@ -1,10 +0,0 @@
-# I believe that this is used in both xpfe- and toolkit-
-# style apps, so it is part of the GRE
-
-[gecko]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/appshell.xpt
--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@@ -44,19 +44,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = appcomps
LIBRARY_NAME = appcomps
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = application
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = appcomps.pkg
-PACKAGE_VARS += MOZ_PHOENIX
-
REQUIRES = xpcom \
string \
rdf \
necko \
uriloader \
docshell \
webshell \
browser \
deleted file mode 100644
--- a/xpfe/components/build/appcomps.pkg
+++ /dev/null
@@ -1,33 +0,0 @@
-# this file packages seamonkey and firebird appcomps...
-# be careful when you make changes
-
-[xpfe-browser browser]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-dist/bin/components/jsconsole-clhandler.js
-dist/bin/components/nsKillAll.js
-dist/bin/components/nsResetPref.js
-
-!xpt dist/bin/components/directory.xpt
-!xpt dist/bin/components/related.xpt
-!xpt dist/bin/components/search.xpt
-!xpt dist/bin/components/windowds.xpt
-!xpt dist/bin/components/mozbrwsr.xpt
-
-#if OS_ARCH==WINNT
-!xpt dist/bin/components/urlwidgt.xpt
-!xpt dist/bin/components/alerts.xpt
-#endif
-
-[xpfe-browser]
-dist/bin/components/nsSidebar.js
-dist/bin/components/nsDownloadProgressListener.js
-!xpt dist/bin/components/bookmarks.xpt
-!xpt dist/bin/components/downloadmanager.xpt
-!xpt dist/bin/components/xpautocomplete.xpt
-!xpt dist/bin/components/history.xpt
-!xpt dist/bin/components/sidebar.xpt
-!xpt dist/bin/components/progressDlg.xpt
--- a/xpfe/components/find/src/Makefile.in
+++ b/xpfe/components/find/src/Makefile.in
@@ -45,18 +45,16 @@ include $(DEPTH)/config/autoconf.mk
MODULE = appcomps
XPIDL_MODULE = mozfind
LIBRARY_NAME = mozfind
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsFindComponent
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = mozfind.pkg
-
REQUIRES = xpcom \
string \
$(NULL)
CPPSRCS = \
nsFindService.cpp \
nsFindModule.cpp \
$(NULL)
deleted file mode 100644
--- a/xpfe/components/find/src/mozfind.pkg
+++ /dev/null
@@ -1,7 +0,0 @@
-[xpfe-browser browser]
-#if SHARED_LIBRARY
-dist/bin/components/@SHARED_LIBRARY@
-#else
-!staticcomp @LIBRARY@ @MODULE_NAME@
-#endif
-!xpt dist/bin/components/mozfind.xpt
deleted file mode 100644
--- a/xpfe/xpfe.pkg
+++ /dev/null
@@ -1,126 +0,0 @@
-[xpfe-browser browser]
-!touch dist/bin/.autoreg
-dist/bin/components/nsCloseAllWindows.js
-dist/bin/chrome/installed-chrome.txt
-dist/bin/chrome/chromelist.txt
-
-# xxxbsmedberg why do we ship the platform jars on all platforms?
-[xpfe-lang-enUS]
-dist/bin/chrome/en-US.jar
-dist/bin/chrome/en-mac.jar
-dist/bin/chrome/en-unix.jar
-dist/bin/chrome/en-win.jar
-
-[xpfe-locale-US]
-dist/bin/chrome/US.jar
-
-[xpfe-browser]
-dist/bin/README.txt dist/bin/readme.txt
-dist/bin/LICENSE dist/bin/license.txt
-dist/bin/chrome/comm.jar
-dist/bin/chrome/toolkit.jar
-dist/bin/chrome/modern.jar
-dist/bin/chrome/classic.jar
-
-# oh, do I hate this... but I hate wildcards even more
-[gecko-tests]
-dist/bin/res/viewer.properties
-dist/bin/res/throbber/anim.gif
-dist/bin/res/throbber/anims00.gif
-dist/bin/res/throbber/anims01.gif
-dist/bin/res/throbber/anims02.gif
-dist/bin/res/throbber/anims03.gif
-dist/bin/res/throbber/anims04.gif
-dist/bin/res/throbber/anims05.gif
-dist/bin/res/throbber/anims06.gif
-dist/bin/res/throbber/anims07.gif
-dist/bin/res/throbber/anims08.gif
-dist/bin/res/throbber/anims09.gif
-dist/bin/res/throbber/anims10.gif
-dist/bin/res/throbber/anims11.gif
-dist/bin/res/throbber/anims12.gif
-dist/bin/res/throbber/anims13.gif
-dist/bin/res/throbber/anims14.gif
-dist/bin/res/throbber/anims15.gif
-dist/bin/res/throbber/anims16.gif
-dist/bin/res/throbber/anims17.gif
-dist/bin/res/throbber/anims18.gif
-dist/bin/res/throbber/anims19.gif
-dist/bin/res/throbber/anims20.gif
-dist/bin/res/throbber/anims21.gif
-dist/bin/res/throbber/anims22.gif
-dist/bin/res/throbber/anims23.gif
-dist/bin/res/throbber/anims24.gif
-dist/bin/res/throbber/anims25.gif
-dist/bin/res/throbber/anims26.gif
-dist/bin/res/throbber/anims27.gif
-dist/bin/res/throbber/anims28.gif
-dist/bin/res/throbber/anims29.gif
-dist/bin/res/samples/aform.css
-dist/bin/res/samples/Anieyes.gif
-dist/bin/res/samples/beeptest.html
-dist/bin/res/samples/bform.css
-dist/bin/res/samples/bg.jpg
-dist/bin/res/samples/cform.css
-dist/bin/res/samples/checkboxTest.xul
-dist/bin/res/samples/colorpicker.xul
-dist/bin/res/samples/demoform.css
-dist/bin/res/samples/dexopenchrome.xul
-dist/bin/res/samples/dexparamdialog.html
-dist/bin/res/samples/dexparamdialog.xul
-dist/bin/res/samples/find.html
-dist/bin/res/samples/gear1.gif
-dist/bin/res/samples/hidetoolicon.css
-dist/bin/res/samples/hidetoolicon.xul
-dist/bin/res/samples/image_props.html
-dist/bin/res/samples/mozform.css
-dist/bin/res/samples/printsetup.html
-dist/bin/res/samples/raptor.jpg
-dist/bin/res/samples/rock_gra.gif
-dist/bin/res/samples/sampleimages/bongo.gif
-dist/bin/res/samples/sampleimages/down.gif
-dist/bin/res/samples/sampleimages/left.gif
-dist/bin/res/samples/sampleimages/right.gif
-dist/bin/res/samples/sampleimages/up.gif
-dist/bin/res/samples/scrollbarTest1.xul
-dist/bin/res/samples/scrollbarTest2.xul
-dist/bin/res/samples/sliderTest1.xul
-dist/bin/res/samples/soundtest.html
-dist/bin/res/samples/tab.xul
-dist/bin/res/samples/test.wav
-dist/bin/res/samples/test0.html
-dist/bin/res/samples/test1.html
-dist/bin/res/samples/test10.html
-dist/bin/res/samples/test11.html
-dist/bin/res/samples/test12.html
-dist/bin/res/samples/test13.html
-dist/bin/res/samples/test14.html
-dist/bin/res/samples/test15.html
-dist/bin/res/samples/test16.html
-dist/bin/res/samples/test2.html
-dist/bin/res/samples/test3.html
-dist/bin/res/samples/test4.html
-dist/bin/res/samples/test5.html
-dist/bin/res/samples/test6.html
-dist/bin/res/samples/test7.html
-dist/bin/res/samples/test8-1.html
-dist/bin/res/samples/test8.html
-dist/bin/res/samples/test8dom.html
-dist/bin/res/samples/test8sca.html
-dist/bin/res/samples/test8siz.html
-dist/bin/res/samples/test8tab.html
-dist/bin/res/samples/test9.html
-dist/bin/res/samples/test9a.html
-dist/bin/res/samples/test9b.html
-dist/bin/res/samples/test_ed.html
-dist/bin/res/samples/test_form.html
-dist/bin/res/samples/test_gfx.html
-dist/bin/res/samples/test_lbox.html
-dist/bin/res/samples/test_pr.html
-dist/bin/res/samples/test_weight.html
-dist/bin/res/samples/toolbarTest1.xul
-dist/bin/res/samples/treeTest1.css
-dist/bin/res/samples/treeTest1.xul
-dist/bin/res/samples/widgets.xul
-dist/bin/res/samples/xpmenu.xul
-dist/bin/res/samples/xulTest.css
--- a/xpinstall/src/Makefile.in
+++ b/xpinstall/src/Makefile.in
@@ -58,18 +58,16 @@ SHORT_LIBNAME = xpinstal
else
EXPORT_LIBRARY = 1
endif
IS_COMPONENT = 1
MODULE_NAME = nsSoftwareUpdate
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
-PACKAGE_FILE = base.pkg
-
REQUIRES = xpcom \
string \
jar \
caps \
content \
necko \
js \
pref \
deleted file mode 100644
--- a/xpinstall/src/base.pkg
+++ /dev/null
@@ -1,19 +0,0 @@
-[gecko xpi-bootstrap]
-dist/bin/components/@SHARED_LIBRARY@
-dist/bin/res/cmessage.txt
-
-[gecko]
-!xpt dist/bin/components/xpinstall.xpt
-
-[xpi-bootstrap]
-dist/bin/@DLLP@xpistub@DLLS@
-
-[gecko-support]
-dist/bin/defaults/pref/xpinstall.js
-
-[xpfe-browser-xpi gre-xpi]
-dist/bin/xpicleanup@BINS@
-
-[unpackaged-files]
-!optional dist/bin/TestLibxpnet@BINS@
-!optional dist/bin/mozilla-installer-bin
