diff options
| author | Grant Gayed <grant_gayed@ca.ibm.com> | 2011-09-28 16:46:36 -0400 |
|---|---|---|
| committer | Grant Gayed <grant_gayed@ca.ibm.com> | 2011-09-28 16:46:36 -0400 |
| commit | 668bccddd8eea7291b5cfbaa57c769a6c662fc27 (patch) | |
| tree | 28593c3e9d6c606372783fe9cfe110f2d00d38d1 /bundles/org.eclipse.swt/Eclipse SWT PI | |
| parent | c6d37fa60688346030b3c61bffe81d1df232904c (diff) | |
| download | eclipse.platform.swt-668bccddd8eea7291b5cfbaa57c769a6c662fc27.tar.gz eclipse.platform.swt-668bccddd8eea7291b5cfbaa57c769a6c662fc27.tar.xz eclipse.platform.swt-668bccddd8eea7291b5cfbaa57c769a6c662fc27.zip | |
don't compile webkit against its headers
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT PI')
| -rw-r--r--[-rwxr-xr-x] | bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh | 28 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak | 8 |
2 files changed, 4 insertions, 32 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 5d69ef1c4e..9a23f364c4 100755..100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh @@ -131,9 +131,6 @@ case $SWT_OS.$SWT_ARCH in if [ "${XULRUNNER_LIBS}" = "" ]; then export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue" fi - if [ "${WEBKIT_INCLUDES}" = "" ]; then - export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/" - fi ;; "linux.x86_64") if [ "${CC}" = "" ]; then @@ -163,9 +160,6 @@ case $SWT_OS.$SWT_ARCH in if [ "${XULRUNNER_LIBS}" = "" ]; then export XULRUNNER_LIBS="-L${XULRUNNER_SDK}/lib -lxpcomglue" fi - if [ "${WEBKIT_INCLUDES}" = "" ]; then - export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/" - fi ;; "linux.ppc") if [ "${CC}" = "" ]; then @@ -195,9 +189,6 @@ case $SWT_OS.$SWT_ARCH in if [ "${PKG_CONFIG_PATH}" = "" ]; then export PKG_CONFIG_PATH="/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_ppc/lib/pkgconfig/" fi - if [ "${WEBKIT_INCLUDES}" = "" ]; then - export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/" - fi ;; "linux.ppc64") if [ "${CC}" = "" ]; then @@ -227,9 +218,6 @@ case $SWT_OS.$SWT_ARCH in if [ "${PKG_CONFIG_PATH}" = "" ]; then export PKG_CONFIG_PATH="/usr/lib64/pkgconfig/:/bluebird/teamswt/swt-builddir/cairo_1.0.2/linux_ppc64/lib/pkgconfig/:/usr/local/GNOME/lib/pkgconfig:/usr/local/gtk2.4/lib/pkgconfig/" fi - if [ "${WEBKIT_INCLUDES}" = "" ]; then - export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/" - fi ;; "solaris.x86") if [ "${CC}" = "" ]; then @@ -343,9 +331,6 @@ case $SWT_OS.$SWT_ARCH in if [ "${PKG_CONFIG_PATH}" = "" ]; then export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" fi - if [ "${WEBKIT_INCLUDES}" = "" ]; then - export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/" - fi ;; "linux.s390x") if [ "${CC}" = "" ]; then @@ -375,9 +360,6 @@ case $SWT_OS.$SWT_ARCH in if [ "${PKG_CONFIG_PATH}" = "" ]; then export PKG_CONFIG_PATH="/usr/local/cairo64/lib/pkgconfig" fi - if [ "${WEBKIT_INCLUDES}" = "" ]; then - export WEBKIT_INCLUDES="`pkg-config --cflags gtk+-2.0` -I/bluebird/teamswt/swt-builddir/webkitgtk/1.2/" - fi ;; "aix.ppc") if [ "${CC}" = "" ]; then @@ -509,14 +491,6 @@ if [ -z "${MOZILLA_INCLUDES}" -a -z "${MOZILLA_LIBS}" -a ${MODEL} != 'sparc64' ] fi fi -if [ x`pkg-config --exists webkit-1.0 && echo YES` = "xYES" ]; then - echo "WebKit found, compiling webkit embedded browser support." - MAKE_WEBKIT=make_webkit -else - echo "WebKit not found:" - echo " *** WebKit embedding support will not be compiled." -fi - # Find AWT if available if [ -z "${AWT_LIB_PATH}" ]; then if [ -f ${JAVA_HOME}/jre/lib/${AWT_ARCH}/libjawt.* ]; then @@ -545,5 +519,5 @@ fi if [ "x${1}" = "xclean" ]; then ${MAKE_TYPE} -f $MAKEFILE clean else - ${MAKE_TYPE} -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA $MAKE_WEBKIT ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} + ${MAKE_TYPE} -f $MAKEFILE all $MAKE_GNOME $MAKE_CAIRO $MAKE_AWT $MAKE_MOZILLA ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} fi 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 9715d39c8b..60c7cd1b27 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 @@ -91,8 +91,6 @@ MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \ -DNO_nsDynamicFunctionLoad XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2 -WEBKITCFLAGS = ${WEBKIT_INCLUDES} - SWT_OBJECTS = swt.o c.o c_stats.o callback.o CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o AWT_OBJECTS = swt_awt.o @@ -281,13 +279,13 @@ $(WEBKIT_LIB): $(WEBKIT_OBJECTS) $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) webkit.o: webkitgtk.c - $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o + $(CC) $(CFLAGS) -c webkitgtk.c -o webkit.o webkit_structs.o: webkitgtk_structs.c - $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_structs.c -o webkit_structs.o + $(CC) $(CFLAGS) -c webkitgtk_structs.c -o webkit_structs.o webkit_stats.o: webkitgtk_stats.c webkitgtk_stats.h - $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk_stats.c -o webkit_stats.o + $(CC) $(CFLAGS) -c webkitgtk_stats.c -o webkit_stats.o # # GLX lib |