Bug 518443: Stop building XULRunner libraries on Linux/GTK

Remove xulrunner related code & targets from build files.

Change-Id: I6274dd444f2005a07ae3e3c55dc573402546223a

7 files changed, 2 insertions, 658 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
index 0257f7fe5c..2298db4af0 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
@@ -72,23 +72,6 @@ cd `dirname $0`
 
 MAKE_TYPE=make
 
-# No longer necessary, but may be useful in future if we want to compile swt.idl rather than using a static one
-#
-# COMPONENTS_DIR=`pwd`/../../components
-# if test ! -f ${COMPONENTS_DIR}/external.xpt; then
-#	if test ! -f ${COMPONENTS_DIR}/external.idl; then
-#		echo "Can't find ${COMPONENTS_DIR}/external.idl"
-#	else
-#		IDLDIR=`pkg-config --variable=idldir libxul | sed 's@/stable$@@'`/unstable
-#		if test ! -d ${IDLDIR}; then
-#			IDLDIR=`pkg-config --variable=idldir libxul`
-#		fi
-#		XPIDL=`pkg-config --variable=sdkdir libxul`/bin/xpidl
-#		echo "${XPIDL} -m typelib -I ${IDLDIR} -e ${COMPONENTS_DIR}/external.xpt ${COMPONENTS_DIR}/external.idl"
-#		${XPIDL} -m typelib -I ${IDLDIR} -e ${COMPONENTS_DIR}/external.xpt ${COMPONENTS_DIR}/external.idl
-#	fi
-# fi
-
 # Determine which OS we are on
 if [ "${OS}" = "" ]; then
 	OS=`uname -s`
@@ -166,27 +149,6 @@ case $SWT_OS.$SWT_ARCH in
 		if [ "${PKG_CONFIG_PATH}" = "" ]; then
 			export PKG_CONFIG_PATH="/usr/lib/pkgconfig:/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_x86/lib/pkgconfig"
 		fi
-		if [ "${MOZILLA_SDK}" = "" ]; then
-			export MOZILLA_SDK="/bluebird/teamswt/swt-builddir/mozilla/1.4/linux_gtk2/mozilla/dist/sdk"
-		fi
-		if [ "${XULRUNNER_SDK}" = "" ]; then
-			export XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/geckoSDK/1.8.0.4/gecko-sdk"
-		fi
-		if [ "${MOZILLA_INCLUDES}" = "" ]; then
-			export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/mozilla-config.h -I${MOZILLA_SDK}/../include/xpcom -I${MOZILLA_SDK}/../include/nspr -I${MOZILLA_SDK}/../include/embed_base -I${MOZILLA_SDK}/../include/embedstring -I${MOZILLA_SDK}/../include/string"
-		fi
-		if [ "${MOZILLA_LIBS}" = "" ]; then
-			export MOZILLA_LIBS="${MOZILLA_SDK}/../lib/libembedstring.a -L${MOZILLA_SDK}/../bin -L${MOZILLA_SDK}/../lib/ -lxpcom -lnspr4 -lplds4 -lplc4"
-		fi
-		if [ "${XULRUNNER_INCLUDES}" = "" ]; then
-			export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
-		fi
-		if [ "${XULRUNNER_LIBS}" = "" ]; then
-			export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
-		fi
-#		if [ "${XULRUNNER31_SDK}" = "" ]; then
-#			export XULRUNNER31_SDK="/bluebird/teamswt/swt-builddir/geckoSDK/31/x86"
-#		fi
 		;;
 	"linux.x86_64")
 		if [ "${CC}" = "" ]; then
@@ -213,27 +175,6 @@ case $SWT_OS.$SWT_ARCH in
 		if [ "${PKG_CONFIG_PATH}" = "" ]; then
 			export PKG_CONFIG_PATH="/usr/lib64/pkgconfig"
 		fi
-		if [ "${MOZILLA_SDK}" = "" ]; then
-			export MOZILLA_SDK="/bluebird/teamswt/swt-builddir/mozilla/1.7/amd64/mozilla/dist/sdk"
-		fi
-		if [ "${MOZILLA_INCLUDES}" = "" ]; then
-			export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"
-		fi
-		if [ "${MOZILLA_LIBS}" = "" ]; then
-			export MOZILLA_LIBS="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
-		fi
-		if [ "${XULRUNNER_SDK}" = "" ]; then
-			export XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/xulrunner/1.8.0.1/amd64/mozilla/dist/sdk"
-		fi
-		if [ "${XULRUNNER_INCLUDES}" = "" ]; then
-			export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
-		fi
-		if [ "${XULRUNNER_LIBS}" = "" ]; then
-			export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
-		fi
-#		if [ "${XULRUNNER31_SDK}" = "" ]; then
-#			export XULRUNNER31_SDK="/bluebird/teamswt/swt-builddir/geckoSDK/31/x86_64"
-#		fi
 		;;
 	"linux.ppc")
 		if [ "${CC}" = "" ]; then
@@ -242,24 +183,6 @@ case $SWT_OS.$SWT_ARCH in
 		if [ "${JAVA_HOME}" = "" ]; then
 			export JAVA_HOME="/home/swtbuild/ibm-java-ppc-80"
 		fi
-		if [ "${MOZILLA_SDK}" = "" ]; then
-			export MOZILLA_SDK=" /bluebird/teamswt/swt-builddir/mozilla/1.7/ppc/mozilla/dist/sdk"
-		fi
-		if [ "${XULRUNNER_SDK}" = "" ]; then
-			export XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/xulrunner/1.8.1.1/ppc/mozilla/dist/sdk/"
-		fi
-		if [ "${MOZILLA_INCLUDES}" = "" ]; then
-			export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"
-		fi
-		if [ "${MOZILLA_LIBS}" = "" ]; then
-			export MOZILLA_LIBS="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
-		fi
-		if [ "${XULRUNNER_INCLUDES}" = "" ]; then
-			export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
-		fi
-		if [ "${XULRUNNER_LIBS}" = "" ]; then
-			export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
-		fi
 		if [ "${PKG_CONFIG_PATH}" = "" ]; then
 			export PKG_CONFIG_PATH="/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_ppc/lib/pkgconfig/"
 		fi
@@ -271,24 +194,6 @@ case $SWT_OS.$SWT_ARCH in
 		if [ "${JAVA_HOME}" = "" ]; then
 			export JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/bin/java::"`
 		fi
-		if [ "${MOZILLA_SDK}" = "" ]; then
-			export MOZILLA_SDK=" /bluebird/teamswt/swt-builddir/mozilla/1.7/ppc64/mozilla/dist/sdk"
-		fi
-		if [ "${MOZILLA_LIBS}" = "" ]; then
-			export MOZILLA_LIBS="-m64 -L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
-		fi
-		if [ "${MOZILLA_INCLUDES}" = "" ]; then
-			export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"
-		fi
-		if [ "${XULRUNNER_SDK}" = "" ]; then
-			export XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/xulrunner/1.8.1.1/ppc64/mozilla/dist/sdk/"
-		fi
-		if [ "${XULRUNNER_INCLUDES}" = "" ]; then
-			export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
-		fi
-		if [ "${XULRUNNER_LIBS}" = "" ]; then
-			export XULRUNNER_LIBS="-m64 -L${XULRUNNER_SDK}/lib -lxpcomglue"
-		fi
 		if [ "${PKG_CONFIG_PATH}" = "" ]; then
 			export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/"
 		fi
@@ -300,24 +205,6 @@ case $SWT_OS.$SWT_ARCH in
 		if [ "${JAVA_HOME}" = "" ]; then
 			export JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/bin/java::"`
 		fi
-		if [ "${MOZILLA_SDK}" = "" ]; then
-			export MOZILLA_SDK=" /bluebird/teamswt/swt-builddir/mozilla/1.7/ppc64le/mozilla/dist/sdk"
-		fi
-		if [ "${MOZILLA_LIBS}" = "" ]; then
-			export MOZILLA_LIBS="-m64 -L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
-		fi
-		if [ "${MOZILLA_INCLUDES}" = "" ]; then
-			export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"
-		fi
-		if [ "${XULRUNNER_SDK}" = "" ]; then
-			export XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/xulrunner/1.8.1.1/ppc64le/mozilla/dist/sdk/"
-		fi
-		if [ "${XULRUNNER_INCLUDES}" = "" ]; then
-			export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
-		fi
-		if [ "${XULRUNNER_LIBS}" = "" ]; then
-			export XULRUNNER_LIBS="-m64 -L${XULRUNNER_SDK}/lib -lxpcomglue"
-		fi
 		if [ "${PKG_CONFIG_PATH}" = "" ]; then
 			export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/"
 		fi
@@ -332,24 +219,6 @@ case $SWT_OS.$SWT_ARCH in
 		if [ "${JAVA_HOME}" = "" ]; then
 			export JAVA_HOME="/bluebird/teamswt/swt-builddir/build/JRE/Solaris_x64/jdk1.8.0_71"
 		fi
-#		if [ "${MOZILLA_SDK}" = "" ]; then
-#			export MOZILLA_SDK="/bluebird/teamswt/bog/mozilla/solaris_x86/1.7/mozilla/dist/sdk"
-#		fi
-#		if [ "${XULRUNNER_SDK}" = "" ]; then
-#			export XULRUNNER_SDK="/bluebird/teamswt/swt-builddir/xulrunner/1.8.0.1/solaris-x86/mozilla/dist/sdk"
-#		fi
-#		if [ "${MOZILLA_INCLUDES}" = "" ]; then
-#			export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/include"
-#		fi
-#		if [ "${MOZILLA_LIBS}" = "" ]; then
-#			export MOZILLA_LIBS="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
-#		fi
-#		if [ "${XULRUNNER_INCLUDES}" = "" ]; then
-#			export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
-#		fi
-#		if [ "${XULRUNNER_LIBS}" = "" ]; then
-#			export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
-#		fi
  		;;
 	"solaris.sparcv9")
 		PATH="/usr/ccs/bin:/opt/csw/bin:$PATH"
@@ -365,15 +234,6 @@ case $SWT_OS.$SWT_ARCH in
 		if [ "${PKG_CONFIG_PATH}" = "" ]; then
 			PKG_CONFIG_PATH="/opt/csw/lib/pkgconfig"
 		fi
-#		if [ "${MOZILLA_SDK}" = "" ]; then
-#			export MOZILLA_SDK="/bluebird/teamswt/swt-builddir/geckoSDK/1.4/gecko-sdk"
-#		fi
-#		if [ "${MOZILLA_INCLUDES}" = "" ]; then
-#			export MOZILLA_INCLUDES="-I${MOZILLA_SDK} -I${MOZILLA_SDK}/xpcom/include -I${MOZILLA_SDK}/nspr/include -I${MOZILLA_SDK}/embed_base/include -I${MOZILLA_SDK}/embedstring/include -I${MOZILLA_SDK}/string/include"
-#		fi
-#		if [ "${MOZILLA_LIBS}" = "" ]; then
-#			export MOZILLA_LIBS="${MOZILLA_SDK}/embedstring/bin/libembedstring.a -L${MOZILLA_SDK}/xpcom/bin -L${MOZILLA_SDK}/nspr/bin -lxpcom -lnspr4 -lplds4 -lplc4"
-#		fi
 		export PATH CC CXX JAVA_HOME PKG_CONFIG_PATH;
 		;;
 	"linux.s390")
@@ -383,24 +243,6 @@ case $SWT_OS.$SWT_ARCH in
 		if [ "${JAVA_HOME}" = "" ]; then
 			export JAVA_HOME="/home/swtbuild/java5/s390/ibm-java2-s390-50"
 		fi
-		if [ "${MOZILLA_SDK}" = "" ]; then
-			export MOZILLA_SDK="/home/swtbuild/mozilla/s390/mozilla-1.7.13/mozilla/dist/sdk"
-		fi
-		if [ "${MOZILLA_INCLUDES}" = "" ]; then
-			export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/../include/xpcom -I${MOZILLA_SDK}/../include/nspr -I${MOZILLA_SDK}/../include/embed_base -I${MOZILLA_SDK}/../include/embedstring -I${MOZILLA_SDK}/../include/string"
-		fi
-		if [ "${MOZILLA_LIBS}" = "" ]; then
-			export MOZILLA_LIBS="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
-		fi
-		if [ "${XULRUNNER_SDK}" = "" ]; then
-			export XULRUNNER_SDK="/home/swtbuild/mozilla/s390/xulrunner-1.8.0.1/mozilla/dist/sdk"
-		fi
-		if [ "${XULRUNNER_INCLUDES}" = "" ]; then
-			export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
-		fi
-		if [ "${XULRUNNER_LIBS}" = "" ]; then
-			export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
-		fi
 		if [ "${PKG_CONFIG_PATH}" = "" ]; then
 			export PKG_CONFIG_PATH="/usr/lib/pkgconfig"
 		fi
@@ -412,24 +254,6 @@ case $SWT_OS.$SWT_ARCH in
 		if [ "${JAVA_HOME}" = "" ]; then
 			export JAVA_HOME="/home/swtbuild/java5/s390x/ibm-java2-s390x-50"
 		fi
-		if [ "${MOZILLA_SDK}" = "" ]; then
-			export MOZILLA_SDK="/home/swtbuild/mozilla/s390x/mozilla1.7.13/mozilla/dist/sdk"
-		fi
-		if [ "${MOZILLA_INCLUDES}" = "" ]; then
-			export MOZILLA_INCLUDES="-include ${MOZILLA_SDK}/include/mozilla-config.h -I${MOZILLA_SDK}/../include/xpcom -I${MOZILLA_SDK}/../include/nspr -I${MOZILLA_SDK}/../include/embed_base -I${MOZILLA_SDK}/../include/embedstring -I${MOZILLA_SDK}/../include/string"
-		fi
-		if [ "${MOZILLA_LIBS}" = "" ]; then
-			export MOZILLA_LIBS="-L${MOZILLA_SDK}/lib -L${MOZILLA_SDK}/bin -lxpcom -lnspr4 -lplds4 -lplc4"
-		fi
-		if [ "${XULRUNNER_SDK}" = "" ]; then
-			export XULRUNNER_SDK="/home/swtbuild/mozilla/s390x/xulrunner-1.8.0.1/mozilla/dist/sdk"
-		fi
-		if [ "${XULRUNNER_INCLUDES}" = "" ]; then
-			export XULRUNNER_INCLUDES="-include ${XULRUNNER_SDK}/include/mozilla-config.h -I${XULRUNNER_SDK}/include"
-		fi
-		if [ "${XULRUNNER_LIBS}" = "" ]; then
-			export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue"
-		fi
 		if [ "${PKG_CONFIG_PATH}" = "" ]; then
 			export PKG_CONFIG_PATH="/usr/lib64/pkgconfig"
 		fi
@@ -525,31 +349,6 @@ else
 	func_echo_error "Cairo not found: Advanced graphics support using cairo will not be compiled."
 fi
 
-if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${SWT_OS} != 'solaris' ]; then
-	if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
-		MOZILLA_INCLUDES=`pkg-config --cflags mozilla-xpcom`
-		MOZILLA_LIBS=`pkg-config --libs mozilla-xpcom`
-		export MOZILLA_INCLUDES
-		export MOZILLA_LIBS
-		MAKE_MOZILLA=make_mozilla
-	elif [ x`pkg-config --exists firefox-xpcom && echo YES` = "xYES" ]; then
-		MOZILLA_INCLUDES=`pkg-config --cflags firefox-xpcom`
-		MOZILLA_LIBS=`pkg-config --libs firefox-xpcom`
-		export MOZILLA_INCLUDES
-		export MOZILLA_LIBS
-		MAKE_MOZILLA=make_mozilla
-	elif [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
-		XULRUNNER_INCLUDES=`pkg-config --cflags libxul`
-		XULRUNNER_LIBS=`pkg-config --libs libxul`
-		export XULRUNNER_INCLUDES
-		export XULRUNNER_LIBS
-		MAKE_MOZILLA=make_xulrunner
-	else
-		func_echo_error "None of the following libraries were found:  Mozilla/XPCOM, Firefox/XPCOM, or XULRunner/XPCOM:"
-		func_echo_error "   >> Mozilla embedding support will not be compiled."
-	fi
-fi
-
 # Find AWT if available
 if [ ${SWT_OS} = 'win32' ]; then
 	AWT_LIB_EXPR="jawt.dll"
@@ -631,7 +430,7 @@ func_echo_plus "Building SWT/GTK+ for Architectures: $SWT_OS $SWT_ARCH"
 func_build_gtk3 () {
 	export GTK_VERSION=3.0
 	func_echo_plus "Building GTK3 bindings:"
-	${MAKE_TYPE} -f $MAKEFILE all $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA "${@}"
+	${MAKE_TYPE} -f $MAKEFILE all $MAKE_CAIRO $MAKE_AWT "${@}"
 	RETURN_VALUE=$?   #make can return 1 or 2 if it fails. Thus need to cache it in case it's used programmatically somewhere.
 	if [ "$RETURN_VALUE" -eq 0 ]; then
 		func_echo_plus "GTK3 Build succeeded"
@@ -648,7 +447,7 @@ func_build_gtk2 () {
 		# Bug 515155: Avoid memcpy@GLIBC_2.14 (old Linux compatibility)
 		SWT_PTR_CFLAGS="${SWT_PTR_CFLAGS} -fno-builtin-memmove"
 	fi
-	${MAKE_TYPE} -f $MAKEFILE all $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA "$@"
+	${MAKE_TYPE} -f $MAKEFILE all $MAKE_CAIRO $MAKE_AWT "$@"
 	RETURN_VALUE=$?
 	if [ "$RETURN_VALUE" -eq 0 ]; then
 		func_echo_plus "GTK2 Build succeeded"
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak
index a0921600f9..258bf760aa 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak
@@ -23,9 +23,6 @@ AWT_PREFIX = swt-awt
 SWTPI_PREFIX = swt-pi
 CAIRO_PREFIX = swt-cairo
 ATK_PREFIX = swt-atk
-MOZILLA_PREFIX = swt-mozilla$(GCC_VERSION)
-XULRUNNER_PREFIX = swt-xulrunner
-XPCOMINIT_PREFIX = swt-xpcominit
 GLX_PREFIX = swt-glx
 
 SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
@@ -33,9 +30,6 @@ AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 SWTPI_LIB = lib$(SWTPI_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 
 CAIROCFLAGS = `pkg-config --cflags cairo`
@@ -56,29 +50,11 @@ GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm
 # Uncomment for Native Stats tool
 #NATIVE_STATS = -DNATIVE_STATS
 
-MOZILLACFLAGS = -O \
-	-DSWT_VERSION=$(SWT_VERSION) \
-	$(NATIVE_STATS) \
-	-DMOZILLA_STRICT_API=1 \
-	-fno-rtti \
-	-fno-exceptions \
-	-Wall \
-	-Wno-non-virtual-dtor \
-	-fPIC \
-	-I. \
-	-I$(JAVA_HOME)/include \
-	-I$(JAVA_HOME)/include/freebsd \
-	${SWT_PTR_CFLAGS}
-MOZILLALFLAGS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
-	
 SWT_OBJECTS = swt.o c.o c_stats.o callback.o
 AWT_OBJECTS = swt_awt.o
 SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
 CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
 ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
-MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
-XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o xpcomxulglue.o xpcomxulglue_stats.o
-XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
 GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
 
 CFLAGS = -O -Wall \
@@ -93,7 +69,6 @@ LFLAGS = -shared -fPIC
 
 ifndef NO_STRIP
 	AWT_LFLAGS := $(AWT_LFLAGS) -s
-	MOZILLALFLAGS := $(MOZILLALFLAGS) -s
 	LFLAGS := $(LFLAGS) -s
 endif
 
@@ -165,69 +140,6 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h
 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_stats.c
 
 #
-# Mozilla lib
-#
-make_mozilla:$(MOZILLA_LIB)
-
-$(MOZILLA_LIB): $(MOZILLA_OBJECTS)
-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-
-xpcom.o: xpcom.cpp
-	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
-
-xpcom_structs.o: xpcom_structs.cpp
-	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
-	
-xpcom_custom.o: xpcom_custom.cpp
-	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
-
-xpcom_stats.o: xpcom_stats.cpp
-	$(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
-
-#
-# XULRunner lib
-#
-make_xulrunner:$(XULRUNNER_LIB)
-
-$(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
-	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
-xpcomxul.o: xpcom.cpp
-	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-
-xpcomxul_structs.o: xpcom_structs.cpp
-	$(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
-	
-xpcomxul_custom.o: xpcom_custom.cpp
-	$(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
-
-xpcomxul_stats.o: xpcom_stats.cpp
-	$(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
-
-xpcomxulglue.o: xpcomglue.cpp
-	$(CXX) -o xpcomxulglue.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue.cpp
-
-xpcomxulglue_stats.o: xpcomglue_stats.cpp
-	$(CXX) -o xpcomxulglue_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcomglue_stats.cpp
-
-#
-# XPCOMInit lib
-#
-make_xpcominit:$(XPCOMINIT_LIB)
-
-$(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
-	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
-xpcominit.o: xpcominit.cpp
-	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-
-xpcominit_structs.o: xpcominit_structs.cpp
-	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_structs.cpp
-	
-xpcominit_stats.o: xpcominit_stats.cpp
-	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp
-
-#
 # GLX lib
 #
 make_glx: $(GLX_LIB)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
index 0b854a631a..b9ec052d0d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
@@ -36,9 +36,6 @@ SWTPI_PREFIX = swt-pi
 endif
 CAIRO_PREFIX = swt-cairo
 ATK_PREFIX = swt-atk
-MOZILLA_PREFIX = swt-mozilla$(GCC_VERSION)
-XULRUNNER_PREFIX = swt-xulrunner
-XPCOMINIT_PREFIX = swt-xpcominit
 WEBKIT_PREFIX = swt-webkit
 GLX_PREFIX = swt-glx
 
@@ -47,9 +44,6 @@ AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 SWTPI_LIB = lib$(SWTPI_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 WEBKIT_LIB = lib$(WEBKIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 
@@ -75,32 +69,6 @@ GLXLIBS = -lGL -lGLU -lm
 # Uncomment for Native Stats tool
 #NATIVE_STATS = -DNATIVE_STATS
 
-MOZILLACFLAGS = -O \
-	-DSWT_VERSION=$(SWT_VERSION) \
-	$(NATIVE_STATS) \
-	-DMOZILLA_STRICT_API=1 \
-	-fno-rtti \
-	-fno-exceptions \
-	-Wall \
-	-Wno-non-virtual-dtor \
-	-fPIC \
-	-I. \
-	-I$(JAVA_HOME)/include \
-	-I$(JAVA_HOME)/include/linux \
-	${SWT_PTR_CFLAGS}
-MOZILLALFLAGS = -shared ${SWT_LFLAGS} -Wl,--version-script=mozilla_exports -Bsymbolic
-MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
-	-DNO__1XPCOMGlueStartup \
-	-DNO__1XPCOMGlueLoadXULFunctions \
-	-DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
-	-DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
-	-DNO_nsDynamicFunctionLoad_1sizeof \
-	-DNO__1Call__IIIIII \
-	-DNO__1Call__JJJJJI \
-	-DNO_nsDynamicFunctionLoad
-XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
-
-
 WEBKITLIBS = `pkg-config --libs-only-l gio-2.0`
 WEBKITCFLAGS = `pkg-config --cflags gio-2.0`
 ifdef SWT_WEBKIT_DEBUG
@@ -115,9 +83,6 @@ AWT_OBJECTS = swt_awt.o
 SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
 CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
 ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
-MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
-XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
-XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
 WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
 GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
 
@@ -139,7 +104,6 @@ ifndef NO_STRIP
 	#      https://gcc.gnu.org/onlinedocs/gcc/Link-Options.html#Link-Options
 	#      http://stackoverflow.com/questions/14175040/effects-of-removing-all-symbol-table-and-relocation-information-from-an-executab
 	AWT_LFLAGS := $(AWT_LFLAGS) -s
-	MOZILLALFLAGS := $(MOZILLALFLAGS) -s
 	LFLAGS := $(LFLAGS) -s
 endif
 
@@ -211,70 +175,6 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h
 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_stats.c
 
 #
-# Mozilla lib
-#
-make_mozilla:$(MOZILLA_LIB)
-
-$(MOZILLA_LIB): $(MOZILLA_OBJECTS)
-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-
-xpcom.o: xpcom.cpp
-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
-
-xpcom_structs.o: xpcom_structs.cpp
-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
-	
-xpcom_custom.o: xpcom_custom.cpp
-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
-
-xpcom_stats.o: xpcom_stats.cpp
-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
-
-#
-# XULRunner libs
-#
-make_xulrunner:$(XULRUNNER_LIB)
-
-$(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
-	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
-xpcomxul.o: xpcom.cpp
-	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-
-xpcomxul_structs.o: xpcom_structs.cpp
-	$(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
-	
-xpcomxul_custom.o: xpcom_custom.cpp
-	$(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
-
-xpcomxul_stats.o: xpcom_stats.cpp
-	$(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
-
-#
-# libswt-xulrunner-fix10.so and libswt-xulrunner-fix31.so are not built each time, they have been built and committed to the repository
-# make_xulrunner_fix:
-#	echo -e "#include<stdlib.h>\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | $(CXX) $(LFLAGS) $(CFLAGS) -xc - -o libswt-xulrunner-fix10.so
-#	echo -e "#include<stdlib.h>\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | $(CXX) $(LFLAGS) $(CFLAGS) -L${XULRUNNER31_SDK}/lib -Wl,--whole-archive -lmozglue -Wl,--no-whole-archive -xc - -o libswt-xulrunner-fix31.so
-#
-
-#
-# XPCOMInit lib
-#
-make_xpcominit:$(XPCOMINIT_LIB)
-
-$(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
-	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
-xpcominit.o: xpcominit.cpp
-	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-
-xpcominit_structs.o: xpcominit_structs.cpp
-	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_structs.cpp
-	
-xpcominit_stats.o: xpcominit_stats.cpp
-	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp
-
-#
 # WebKit lib
 #
 make_webkit: $(WEBKIT_LIB)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris.mak
index 7a1bdcf05a..6c95c0ee38 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris.mak
@@ -23,9 +23,6 @@ AWT_PREFIX = swt-awt
 SWTPI_PREFIX = swt-pi
 CAIRO_PREFIX = swt-cairo
 ATK_PREFIX = swt-atk
-MOZILLA_PREFIX = swt-mozilla$(GCC_VERSION)
-XULRUNNER_PREFIX = swt-xulrunner
-XPCOMINIT_PREFIX = swt-xpcominit
 GLX_PREFIX = swt-glx
 
 SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
@@ -33,9 +30,6 @@ AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 SWTPI_LIB = lib$(SWTPI_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 
 CAIROCFLAGS = `pkg-config --cflags cairo`
@@ -56,36 +50,11 @@ GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm
 # Uncomment for Native Stats tool
 #NATIVE_STATS = -DNATIVE_STATS
 
-MOZILLACFLAGS = -O \
-	-DSWT_VERSION=$(SWT_VERSION) \
-	$(NATIVE_STATS) \
-	-DMOZILLA_STRICT_API=1 \
-	-KPIC \
-	+w \
-	-I. \
-	-I$(JAVA_HOME)/include \
-	-I$(JAVA_HOME)/include/solaris \
-	${SWT_PTR_CFLAGS}
-MOZILLALFLAGS =  -G
-MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
-	-DNO__1XPCOMGlueStartup \
-	-DNO__1XPCOMGlueLoadXULFunctions \
-	-DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
-	-DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
-	-DNO_nsDynamicFunctionLoad_1sizeof \
-	-DNO__1Call__IIIIII \
-	-DNO__1Call__JJJJJI \
-	-DNO_nsDynamicFunctionLoad
-XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
-
 SWT_OBJECTS = swt.o c.o c_stats.o callback.o
 AWT_OBJECTS = swt_awt.o
 SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
 CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
 ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
-MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
-XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
-XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
 GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
 
 CFLAGS = -O \
@@ -168,63 +137,6 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h
 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_stats.c
 
 #
-# Mozilla lib
-#
-make_mozilla:$(MOZILLA_LIB)
-
-$(MOZILLA_LIB): $(MOZILLA_OBJECTS)
-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-
-xpcom.o: xpcom.cpp
-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
-
-xpcom_structs.o: xpcom_structs.cpp
-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
-	
-xpcom_custom.o: xpcom_custom.cpp
-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
-
-xpcom_stats.o: xpcom_stats.cpp
-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
-
-#
-# XULRunner lib
-#
-make_xulrunner:$(XULRUNNER_LIB)
-
-$(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
-	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
-xpcomxul.o: xpcom.cpp
-	$(CXX) -o xpcomxul.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-
-xpcomxul_structs.o: xpcom_structs.cpp
-	$(CXX) -o xpcomxul_structs.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
-	
-xpcomxul_custom.o: xpcom_custom.cpp
-	$(CXX) -o xpcomxul_custom.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
-
-xpcomxul_stats.o: xpcom_stats.cpp
-	$(CXX) -o xpcomxul_stats.o -DXULRUNNER $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
-
-#
-# XPCOMInit lib
-#
-make_xpcominit:$(XPCOMINIT_LIB)
-
-$(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
-	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
-xpcominit.o: xpcominit.cpp
-	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-
-xpcominit_structs.o: xpcominit_structs.cpp
-	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_structs.cpp
-	
-xpcominit_stats.o: xpcominit_stats.cpp
-	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp
-
-#
 # GLX lib
 #
 make_glx: $(GLX_LIB)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86.mak
index f848af2811..ce3281fa64 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86.mak
@@ -23,9 +23,6 @@ AWT_PREFIX = swt-awt
 SWTPI_PREFIX = swt-pi
 CAIRO_PREFIX = swt-cairo
 ATK_PREFIX = swt-atk
-MOZILLA_PREFIX = swt-mozilla$(GCC_VERSION)
-XULRUNNER_PREFIX = swt-xulrunner
-XPCOMINIT_PREFIX = swt-xpcominit
 GLX_PREFIX = swt-glx
 
 SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
@@ -33,9 +30,6 @@ AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 SWTPI_LIB = lib$(SWTPI_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 
 CAIROCFLAGS = `pkg-config --cflags cairo`
@@ -56,36 +50,11 @@ GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm
 # Uncomment for Native Stats tool
 #NATIVE_STATS = -DNATIVE_STATS
 
-MOZILLACFLAGS = -O \
-	-DSWT_VERSION=$(SWT_VERSION) \
-	$(NATIVE_STATS) \
-	-DMOZILLA_STRICT_API=1 \
-	-KPIC \
-	+w \
-	-I. \
-	-I$(JAVA_HOME)/include \
-	-I$(JAVA_HOME)/include/linux \
-	${SWT_PTR_CFLAGS}
-MOZILLALFLAGS =  -G
-MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
-	-DNO__1XPCOMGlueStartup \
-	-DNO__1XPCOMGlueLoadXULFunctions \
-	-DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
-	-DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
-	-DNO_nsDynamicFunctionLoad_1sizeof \
-	-DNO__1Call__IIIIII \
-	-DNO__1Call__JJJJJI \
-	-DNO_nsDynamicFunctionLoad
-XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
-
 SWT_OBJECTS = swt.o c.o c_stats.o callback.o
 AWT_OBJECTS = swt_awt.o
 SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
 CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
 ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
-MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
-XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
-XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
 GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
 
 CFLAGS = -O  +w \
@@ -100,7 +69,6 @@ LFLAGS = -G -KPIC
 
 ifndef NO_STRIP
 	AWT_LFLAGS := $(AWT_LFLAGS) -s
-	MOZILLALFLAGS := $(MOZILLALFLAGS) -s
 	LFLAGS := $(LFLAGS) -s
 endif
 
@@ -172,63 +140,6 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h
 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_stats.c
 
 #
-# Mozilla lib
-#
-make_mozilla:$(MOZILLA_LIB)
-
-$(MOZILLA_LIB): $(MOZILLA_OBJECTS)
-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-
-xpcom.o: xpcom.cpp
-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
-
-xpcom_structs.o: xpcom_structs.cpp
-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
-	
-xpcom_custom.o: xpcom_custom.cpp
-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
-
-xpcom_stats.o: xpcom_stats.cpp
-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
-
-#
-# XULRunner lib
-#
-make_xulrunner:$(XULRUNNER_LIB)
-
-$(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
-	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
-xpcomxul.o: xpcom.cpp
-	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-
-xpcomxul_structs.o: xpcom_structs.cpp
-	$(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
-	
-xpcomxul_custom.o: xpcom_custom.cpp
-	$(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
-
-xpcomxul_stats.o: xpcom_stats.cpp
-	$(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
-
-#
-# XPCOMInit lib
-#
-make_xpcominit:$(XPCOMINIT_LIB)
-
-$(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
-	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
-xpcominit.o: xpcominit.cpp
-	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-
-xpcominit_structs.o: xpcominit_structs.cpp
-	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_structs.cpp
-	
-xpcominit_stats.o: xpcominit_stats.cpp
-	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp
-
-#
 # GLX lib
 #
 make_glx: $(GLX_LIB)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86_64.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86_64.mak
index 51a493be51..dc1c53f91f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86_64.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86_64.mak
@@ -23,9 +23,6 @@ AWT_PREFIX = swt-awt
 SWTPI_PREFIX = swt-pi
 CAIRO_PREFIX = swt-cairo
 ATK_PREFIX = swt-atk
-MOZILLA_PREFIX = swt-mozilla$(GCC_VERSION)
-XULRUNNER_PREFIX = swt-xulrunner
-XPCOMINIT_PREFIX = swt-xpcominit
 GLX_PREFIX = swt-glx
 
 SWT_LIB = lib$(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
@@ -33,9 +30,6 @@ AWT_LIB = lib$(AWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 SWTPI_LIB = lib$(SWTPI_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 CAIRO_LIB = lib$(CAIRO_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 ATK_LIB = lib$(ATK_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
-XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
 
 CAIROCFLAGS = `pkg-config --cflags cairo`
@@ -56,36 +50,11 @@ GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm
 # Uncomment for Native Stats tool
 #NATIVE_STATS = -DNATIVE_STATS
 
-MOZILLACFLAGS = -O \
-	-DSWT_VERSION=$(SWT_VERSION) \
-	$(NATIVE_STATS) \
-	-DMOZILLA_STRICT_API=1 \
-	-KPIC \
-	+w \
-	-I. \
-	-I$(JAVA_HOME)/include \
-	-I$(JAVA_HOME)/include/solaris \
-	${SWT_PTR_CFLAGS}
-MOZILLALFLAGS =  -G
-MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
-	-DNO__1XPCOMGlueStartup \
-	-DNO__1XPCOMGlueLoadXULFunctions \
-	-DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
-	-DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
-	-DNO_nsDynamicFunctionLoad_1sizeof \
-	-DNO__1Call__IIIIII \
-	-DNO__1Call__JJJJJI \
-	-DNO_nsDynamicFunctionLoad
-XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
-
 SWT_OBJECTS = swt.o c.o c_stats.o callback.o
 AWT_OBJECTS = swt_awt.o
 SWTPI_OBJECTS = swt.o os.o os_structs.o os_custom.o os_stats.o
 CAIRO_OBJECTS = swt.o cairo.o cairo_structs.o cairo_stats.o
 ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
-MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
-XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomxul_stats.o
-XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
 GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
 
 CFLAGS = -O  +w \
@@ -100,7 +69,6 @@ LFLAGS = -G -KPIC ${SWT_LFLAGS}
 
 ifndef NO_STRIP
 	AWT_LFLAGS := $(AWT_LFLAGS) -s
-	MOZILLALFLAGS := $(MOZILLALFLAGS) -s
 	LFLAGS := $(LFLAGS) -s
 endif
 
@@ -172,63 +140,6 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h
 	$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk_stats.c
 
 #
-# Mozilla lib
-#
-make_mozilla:$(MOZILLA_LIB)
-
-$(MOZILLA_LIB): $(MOZILLA_OBJECTS)
-	$(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-
-xpcom.o: xpcom.cpp
-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
-
-xpcom_structs.o: xpcom_structs.cpp
-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
-	
-xpcom_custom.o: xpcom_custom.cpp
-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
-
-xpcom_stats.o: xpcom_stats.cpp
-	$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
-
-#
-# XULRunner lib
-#
-make_xulrunner:$(XULRUNNER_LIB)
-
-$(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
-	$(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
-xpcomxul.o: xpcom.cpp
-	$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-
-xpcomxul_structs.o: xpcom_structs.cpp
-	$(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
-	
-xpcomxul_custom.o: xpcom_custom.cpp
-	$(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
-
-xpcomxul_stats.o: xpcom_stats.cpp
-	$(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
-
-#
-# XPCOMInit lib
-#
-make_xpcominit:$(XPCOMINIT_LIB)
-
-$(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
-	$(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
-xpcominit.o: xpcominit.cpp
-	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-
-xpcominit_structs.o: xpcominit_structs.cpp
-	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_structs.cpp
-	
-xpcominit_stats.o: xpcominit_stats.cpp
-	$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit_stats.cpp
-
-#
 # GLX lib
 #
 make_glx: $(GLX_LIB)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_win32.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_win32.mak
index 090570cc35..ae25262d36 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_win32.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_win32.mak
@@ -86,7 +86,6 @@ LFLAGS = -shared -fPIC ${SWT_LFLAGS}
 
 ifndef NO_STRIP
 	AWT_LFLAGS := $(AWT_LFLAGS) -s
-	MOZILLALFLAGS := $(MOZILLALFLAGS) -s
 	LFLAGS := $(LFLAGS) -s
 endif