[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:50:30 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit e76fd0e00f11e6c87413d6afbe52614f5ff02e7c
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 16 22:10:12 2001 +0000
I have made substantial changes to the build environment in WebCore, specifically to the way we link our code. The main improvement is that we now build a single library, called libwebcore.dylib, for the whole source tree.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@334 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/kjs/Makefile.in b/JavaScriptCore/kjs/Makefile.in
index ca8efde..c8b5f1c 100644
--- a/JavaScriptCore/kjs/Makefile.in
+++ b/JavaScriptCore/kjs/Makefile.in
@@ -73,7 +73,9 @@ CXXOBJECTS = \
PROGRAM = testkjs
-OBJECTS = $(CXXYACCOBJECTS) $(CXXOBJECTS)
+OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/lib/kjs
LIBRARY = libkjs.a
@@ -94,7 +96,7 @@ YACCFLAGS = -d --output-file=grammar.cpp --name-prefix=kjsyy
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY) $(PROGRAM)
+all: $(CXXYACCOBJECTS) $(OBJECTS) $(LIBRARY) $(PROGRAM) export-objects
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/.cvsignore b/WebCore/.cvsignore
index 905cce5..58b3fc6 100644
--- a/WebCore/.cvsignore
+++ b/WebCore/.cvsignore
@@ -5,3 +5,4 @@ config.status
config.log
config.h
config.cache
+lib
diff --git a/WebCore/Makefile.in b/WebCore/Makefile.in
index 66f8e2f..45453d8 100644
--- a/WebCore/Makefile.in
+++ b/WebCore/Makefile.in
@@ -31,6 +31,7 @@ SUBDIRS = \
src/kwq/ \
src/kwq/qt \
src/kwq/kde \
+ lib \
src/kwq/tests \
src/kwq/tests/qt \
$(NULL)
@@ -63,8 +64,6 @@ test:
./harness
local-all:
- ./makelibkde
-
local-dep:
local-install:
local-setup:
diff --git a/WebCore/Makefile.rules.in b/WebCore/Makefile.rules.in
index 6ff532c..3d86648 100644
--- a/WebCore/Makefile.rules.in
+++ b/WebCore/Makefile.rules.in
@@ -49,6 +49,21 @@ $(filter %.o,$(CXXOBJECTS)): %.o: %.cpp
#----------------------------------------------------------------------
# Standard subdir targets
+export-objects: $(EXPORT_OBJECTS)
+ if [ ! -d "$(EXPORT_OBJECTS_DIR)" ]; then \
+ rm -f $(EXPORT_OBJECTS_DIR); \
+ mkdir -p $(EXPORT_OBJECTS_DIR); \
+ fi
+ for OBJECT in $?; do \
+ ln -f $$OBJECT $(EXPORT_OBJECTS_DIR)/$$OBJECT; \
+ done
+ touch $@
+
+lib:
+ @$(MAKE) && \
+ (cd $(TOPSRCDIR)/lib || mkdir $(TOPSRCDIR)/lib) && \
+ $(MAKE)
+
setup:
@if (test -f "./MakeSystemChanges.sh"); then \
./MakeSystemChanges.sh; \
@@ -58,7 +73,7 @@ depend:
$(CC) -MM $(DEPFLAGS) $(SOURCES) > Makefile.dep
clean:
- rm -f ${CLEAN_FILES} core
+ rm -rf ${CLEAN_FILES} core
distclean:
${MAKE} clean
diff --git a/WebCore/Makefile.vars.in b/WebCore/Makefile.vars.in
index b745906..5c75d42 100644
--- a/WebCore/Makefile.vars.in
+++ b/WebCore/Makefile.vars.in
@@ -22,6 +22,8 @@ YACCOBJECTS =
COBJECTS =
CXXOBJECTS =
OBJECTS =
+EXPORT_OBJECTS =
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/lib
HEADERS =
CLEAN_FILES =
@@ -48,6 +50,7 @@ BASECMMFLAGS = @CXXFLAGS@
BASELDFLAGS = @LDFLAGS@
BASEYACCFLAGS = @YACCFLAGS@
BASELEXFLAGS = @LEXFLAGS@
+BASEDYLIBFLAGS = @DYLIBFLAGS@
ARFLAGS = $(BASEARFLAGS)
CFLAGS = $(BASECFLAGS)
@@ -56,6 +59,7 @@ CMMFLAGS = $(BASECMMFLAGS)
LDFLAGS = $(BASELDFLAGS)
YACCFLAGS = $(BASEYACCFLAGS)
LEXFLAGS = $(BASELEXFLAGS)
+DYLIBFLAGS = $(BASEDYLIBFLAGS)
DEPFLAGS = $(BASECXXFLAGS)
diff --git a/WebCore/configure b/WebCore/configure
index e781565..ee19e5b 100644
--- a/WebCore/configure
+++ b/WebCore/configure
@@ -1041,13 +1041,15 @@ if test -z "$ac_cv_prog_CXX"; then
$CONFIG_ERR c++
exit 1
fi
-CFLAGS="-g -fno-coalesce-static-vtables -DHAVE_CONFIG_H"
+CFLAGS="-DHAVE_CONFIG_H -g -fno-common"
-CXXFLAGS=$CFLAGS
+CXXFLAGS="$CFLAGS -fno-coalesce-static-vtables"
+
+DYLIBFLAGS="-dynamiclib"
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1051: checking how to run the C preprocessor" >&5
+echo "configure:1053: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1062,13 +1064,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1066 "configure"
+#line 1068 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1072: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1079,13 +1081,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1083 "configure"
+#line 1085 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1096,13 +1098,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1100 "configure"
+#line 1102 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1129,7 +1131,7 @@ echo "$ac_t""$CPP" 1>&6
# Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1133: checking for $ac_word" >&5
+echo "configure:1135: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1163,7 +1165,7 @@ then
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:1167: checking for yywrap in -l$ac_lib" >&5
+echo "configure:1169: checking for yywrap in -l$ac_lib" >&5
ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1171,7 +1173,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1175 "configure"
+#line 1177 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1182,7 +1184,7 @@ int main() {
yywrap()
; return 0; }
EOF
-if { (eval echo configure:1186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1205,7 +1207,7 @@ fi
fi
echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:1209: checking lex output file root" >&5
+echo "configure:1211: checking lex output file root" >&5
if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1226,7 +1228,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6
LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
-echo "configure:1230: checking whether yytext is a pointer" >&5
+echo "configure:1232: checking whether yytext is a pointer" >&5
if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1238,14 +1240,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LEXLIB"
cat > conftest.$ac_ext <<EOF
-#line 1242 "configure"
+#line 1244 "configure"
#include "confdefs.h"
`cat $LEX_OUTPUT_ROOT.c`
int main() {
; return 0; }
EOF
-if { (eval echo configure:1249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_prog_lex_yytext_pointer=yes
else
@@ -1271,7 +1273,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1275: checking for $ac_word" >&5
+echo "configure:1277: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1312,7 +1314,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1316: checking for $ac_word" >&5
+echo "configure:1318: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1351,7 +1353,7 @@ YACCFLAGS="-d"
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1355: checking for $ac_word" >&5
+echo "configure:1357: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1387,7 +1389,7 @@ ARFLAGS="cr"
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1391: checking for $ac_word" >&5
+echo "configure:1393: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1424,7 +1426,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1428: checking for $ac_word" >&5
+echo "configure:1430: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_SED'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1461,7 +1463,7 @@ fi
# Extract the first word of "gperf", so it can be a program name with args.
set dummy gperf; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1465: checking for $ac_word" >&5
+echo "configure:1467: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_GPERF'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1493,7 +1495,7 @@ if test -z "$ac_cv_prog_GPERF"; then
fi
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1497: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1499: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1531,7 +1533,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1535: checking for a BSD compatible install" >&5
+echo "configure:1537: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1606,12 +1608,12 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-echo "configure:1610: checking whether stat file-mode macros are broken" >&5
+echo "configure:1612: checking whether stat file-mode macros are broken" >&5
if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1615 "configure"
+#line 1617 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -1666,12 +1668,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:1670: checking for $ac_hdr that defines DIR" >&5
+echo "configure:1672: checking for $ac_hdr that defines DIR" >&5
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1675 "configure"
+#line 1677 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -1679,7 +1681,7 @@ int main() {
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:1683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1685: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -1704,7 +1706,7 @@ done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:1708: checking for opendir in -ldir" >&5
+echo "configure:1710: checking for opendir in -ldir" >&5
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1712,7 +1714,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1716 "configure"
+#line 1718 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1723,7 +1725,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:1727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1745,7 +1747,7 @@ fi
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1749: checking for opendir in -lx" >&5
+echo "configure:1751: checking for opendir in -lx" >&5
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1753,7 +1755,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1757 "configure"
+#line 1759 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -1764,7 +1766,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:1768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1787,12 +1789,12 @@ fi
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1791: checking for ANSI C header files" >&5
+echo "configure:1793: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1796 "configure"
+#line 1798 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1800,7 +1802,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1817,7 +1819,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1821 "configure"
+#line 1823 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1835,7 +1837,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1839 "configure"
+#line 1841 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1856,7 +1858,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1860 "configure"
+#line 1862 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1867,7 +1869,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1894,17 +1896,17 @@ for ac_hdr in sys/param.h sys/mman.h sys/time.h sys/cdefs.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1898: checking for $ac_hdr" >&5
+echo "configure:1900: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1903 "configure"
+#line 1905 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1934,17 +1936,17 @@ for ac_hdr in fnmatch.h sysent.h strings.h sys/stat.h sys/select.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1938: checking for $ac_hdr" >&5
+echo "configure:1940: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1943 "configure"
+#line 1945 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1948: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1974,17 +1976,17 @@ for ac_hdr in sys/socket.h socketbits.h sigaction.h paths.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1978: checking for $ac_hdr" >&5
+echo "configure:1980: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1983 "configure"
+#line 1985 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2014,17 +2016,17 @@ for ac_hdr in malloc.h limits.h dlfcn.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2018: checking for $ac_hdr" >&5
+echo "configure:2020: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2023 "configure"
+#line 2025 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2053,7 +2055,7 @@ done
echo $ac_n "checking for jpeg_mem_init in -ljpeg""... $ac_c" 1>&6
-echo "configure:2057: checking for jpeg_mem_init in -ljpeg" >&5
+echo "configure:2059: checking for jpeg_mem_init in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_mem_init | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2061,7 +2063,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2065 "configure"
+#line 2067 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2072,7 +2074,7 @@ int main() {
jpeg_mem_init()
; return 0; }
EOF
-if { (eval echo configure:2076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2102,12 +2104,12 @@ fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2106: checking for working const" >&5
+echo "configure:2108: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2111 "configure"
+#line 2113 "configure"
#include "confdefs.h"
int main() {
@@ -2156,7 +2158,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:2160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -2177,21 +2179,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2181: checking for inline" >&5
+echo "configure:2183: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 2188 "configure"
+#line 2190 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:2195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -2217,12 +2219,12 @@ EOF
esac
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2221: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2223: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2226 "configure"
+#line 2228 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -2231,7 +2233,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:2235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -2253,9 +2255,9 @@ fi
echo $ac_n "checking whether sys/stat.h declares S_ISSOCK""... $ac_c" 1>&6
-echo "configure:2257: checking whether sys/stat.h declares S_ISSOCK" >&5
+echo "configure:2259: checking whether sys/stat.h declares S_ISSOCK" >&5
cat > conftest.$ac_ext <<EOF
-#line 2259 "configure"
+#line 2261 "configure"
#include "confdefs.h"
#include <sys/stat.h>
int main() {
@@ -2269,7 +2271,7 @@ void foo() {
; return 0; }
EOF
-if { (eval echo configure:2273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
cat >> confdefs.h <<EOF
@@ -2293,12 +2295,12 @@ rm -f conftest*
for ac_func in socket vsnprintf seteuid setegid random strfmon stpcpy mkstemp gettimeofday setenv unsetenv mkstemps
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2297: checking for $ac_func" >&5
+echo "configure:2299: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2302 "configure"
+#line 2304 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2321,7 +2323,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2354,12 +2356,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:2358: checking for pid_t" >&5
+echo "configure:2360: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2363 "configure"
+#line 2365 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2388,17 +2390,17 @@ fi
ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:2392: checking for vfork.h" >&5
+echo "configure:2394: checking for vfork.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2397 "configure"
+#line 2399 "configure"
#include "confdefs.h"
#include <vfork.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2423,18 +2425,18 @@ else
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:2427: checking for working vfork" >&5
+echo "configure:2429: checking for working vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:2433: checking for vfork" >&5
+echo "configure:2435: checking for vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2438 "configure"
+#line 2440 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vfork(); below. */
@@ -2457,7 +2459,7 @@ vfork();
; return 0; }
EOF
-if { (eval echo configure:2461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vfork=yes"
else
@@ -2479,7 +2481,7 @@ fi
ac_cv_func_vfork_works=$ac_cv_func_vfork
else
cat > conftest.$ac_ext <<EOF
-#line 2483 "configure"
+#line 2485 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
@@ -2574,7 +2576,7 @@ main() {
}
}
EOF
-if { (eval echo configure:2578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_vfork_works=yes
else
@@ -2601,17 +2603,17 @@ for ac_hdr in ieeefp.h float.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2605: checking for $ac_hdr" >&5
+echo "configure:2607: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2610 "configure"
+#line 2612 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2617: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2638,7 +2640,7 @@ fi
done
echo $ac_n "checking for isinf in -lm""... $ac_c" 1>&6
-echo "configure:2642: checking for isinf in -lm" >&5
+echo "configure:2644: checking for isinf in -lm" >&5
ac_lib_var=`echo m'_'isinf | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2646,7 +2648,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2650 "configure"
+#line 2652 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2657,7 +2659,7 @@ int main() {
isinf()
; return 0; }
EOF
-if { (eval echo configure:2661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2683,7 +2685,7 @@ else
fi
echo $ac_n "checking for finite in -lm""... $ac_c" 1>&6
-echo "configure:2687: checking for finite in -lm" >&5
+echo "configure:2689: checking for finite in -lm" >&5
ac_lib_var=`echo m'_'finite | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2691,7 +2693,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2695 "configure"
+#line 2697 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2702,7 +2704,7 @@ int main() {
finite()
; return 0; }
EOF
-if { (eval echo configure:2706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2728,7 +2730,7 @@ else
fi
echo $ac_n "checking for _finite in -lm""... $ac_c" 1>&6
-echo "configure:2732: checking for _finite in -lm" >&5
+echo "configure:2734: checking for _finite in -lm" >&5
ac_lib_var=`echo m'_'_finite | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2736,7 +2738,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2740 "configure"
+#line 2742 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2747,7 +2749,7 @@ int main() {
_finite()
; return 0; }
EOF
-if { (eval echo configure:2751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2773,7 +2775,7 @@ else
fi
echo $ac_n "checking for isnan in -lm""... $ac_c" 1>&6
-echo "configure:2777: checking for isnan in -lm" >&5
+echo "configure:2779: checking for isnan in -lm" >&5
ac_lib_var=`echo m'_'isnan | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2781,7 +2783,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2785 "configure"
+#line 2787 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2792,7 +2794,7 @@ int main() {
isnan()
; return 0; }
EOF
-if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3685,6 +3687,7 @@ trap 'rm -fr `echo "Makefile
src/kwq/kde/Makefile
src/kwq/tests/Makefile
src/kwq/tests/qt/Makefile
+ lib/Makefile
config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -3727,6 +3730,7 @@ s%@host_vendor@%$host_vendor%g
s%@host_os@%$host_os%g
s%@CC@%$CC%g
s%@CXX@%$CXX%g
+s%@DYLIBFLAGS@%$DYLIBFLAGS%g
s%@CPP@%$CPP%g
s%@LEX@%$LEX%g
s%@LEXLIB@%$LEXLIB%g
@@ -3803,6 +3807,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
src/kwq/kde/Makefile
src/kwq/tests/Makefile
src/kwq/tests/qt/Makefile
+ lib/Makefile
"}
EOF
cat >> $CONFIG_STATUS <<\EOF
diff --git a/WebCore/configure.in b/WebCore/configure.in
index 95c3f63..fb13de6 100644
--- a/WebCore/configure.in
+++ b/WebCore/configure.in
@@ -59,10 +59,12 @@ if test -z "$ac_cv_prog_CXX"; then
$CONFIG_ERR c++
exit 1
fi
-CFLAGS="-g -fno-coalesce-static-vtables -DHAVE_CONFIG_H"
+CFLAGS="-DHAVE_CONFIG_H -g -fno-common"
AC_SUBST(CFLAGS)
-CXXFLAGS=$CFLAGS
+CXXFLAGS="$CFLAGS -fno-coalesce-static-vtables"
AC_SUBST(CXXFLAGS)
+DYLIBFLAGS="-dynamiclib"
+AC_SUBST(DYLIBFLAGS)
AC_DECL_YYTEXT
AC_CHECK_PROGS(LEX, flex lex)
@@ -725,5 +727,6 @@ AC_OUTPUT(
src/kwq/kde/Makefile
src/kwq/tests/Makefile
src/kwq/tests/qt/Makefile
+ lib/Makefile
)
diff --git a/WebCore/khtml/.cvsignore b/WebCore/khtml/.cvsignore
index 2e72928..6bf3bf6 100644
--- a/WebCore/khtml/.cvsignore
+++ b/WebCore/khtml/.cvsignore
@@ -8,3 +8,4 @@ SunWS_cache
ir.out
testkhtml_static
*.moc
+export-objects
diff --git a/WebCore/khtml/Makefile.in b/WebCore/khtml/Makefile.in
index 3cb88e1..335eafc 100644
--- a/WebCore/khtml/Makefile.in
+++ b/WebCore/khtml/Makefile.in
@@ -23,6 +23,7 @@ CXXOBJECTS = \
$(NULL)
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtml.a
@@ -60,7 +61,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/css/.cvsignore b/WebCore/khtml/css/.cvsignore
index bc205c3..687f319 100644
--- a/WebCore/khtml/css/.cvsignore
+++ b/WebCore/khtml/css/.cvsignore
@@ -11,3 +11,4 @@ cssvalues.h
cssproperties.c
cssproperties.strip
cssproperties.h
+export-objects
diff --git a/WebCore/khtml/css/Makefile.in b/WebCore/khtml/css/Makefile.in
index 295171c..26c8e91 100644
--- a/WebCore/khtml/css/Makefile.in
+++ b/WebCore/khtml/css/Makefile.in
@@ -43,6 +43,7 @@ PROPFILES = \
CFILES = $(VALUEFILES) $(PROPFILES)
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmlcss.a
@@ -78,7 +79,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(CFILES) $(OBJECTS) $(LIBRARY)
+all: $(CFILES) $(OBJECTS) export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/dom/.cvsignore b/WebCore/khtml/dom/.cvsignore
index 4a22210..def1ee8 100644
--- a/WebCore/khtml/dom/.cvsignore
+++ b/WebCore/khtml/dom/.cvsignore
@@ -2,3 +2,4 @@ Makefile
Makefile.in
*.kde
*.dep
+export-objects
diff --git a/WebCore/khtml/dom/Makefile.in b/WebCore/khtml/dom/Makefile.in
index 44797c2..58f8c3b 100644
--- a/WebCore/khtml/dom/Makefile.in
+++ b/WebCore/khtml/dom/Makefile.in
@@ -23,6 +23,7 @@ HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmldom.a
@@ -56,7 +57,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) export-objects
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/ecma/.cvsignore b/WebCore/khtml/ecma/.cvsignore
index 39a4cb9..35b78ab 100644
--- a/WebCore/khtml/ecma/.cvsignore
+++ b/WebCore/khtml/ecma/.cvsignore
@@ -5,3 +5,4 @@ Makefile.in
*.dep
*.moc
*.gperf
+export-objects
diff --git a/WebCore/khtml/ecma/Makefile.in b/WebCore/khtml/ecma/Makefile.in
index 6794638..a02a9d1 100644
--- a/WebCore/khtml/ecma/Makefile.in
+++ b/WebCore/khtml/ecma/Makefile.in
@@ -20,6 +20,7 @@ HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(filter-out testecma.o,$(CXXOBJECTS))
LIBRARY = libkhtmlecma.a
@@ -56,7 +57,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(LIBRARY) export-objects
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/html/.cvsignore b/WebCore/khtml/html/.cvsignore
index 0197895..9769007 100644
--- a/WebCore/khtml/html/.cvsignore
+++ b/WebCore/khtml/html/.cvsignore
@@ -3,3 +3,4 @@ Makefile.in
*.dep
*.moc
*.kde
+export-objects
diff --git a/WebCore/khtml/html/Makefile.in b/WebCore/khtml/html/Makefile.in
index 9ee41d8..881e406 100644
--- a/WebCore/khtml/html/Makefile.in
+++ b/WebCore/khtml/html/Makefile.in
@@ -20,6 +20,7 @@ HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmlhtml.a
@@ -58,7 +59,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/java/.cvsignore b/WebCore/khtml/java/.cvsignore
index b31bca8..2e02a1b 100644
--- a/WebCore/khtml/java/.cvsignore
+++ b/WebCore/khtml/java/.cvsignore
@@ -4,3 +4,4 @@ Makefile.in
*.kde
*.dep
*.moc
+export-objects
diff --git a/WebCore/khtml/java/Makefile.in b/WebCore/khtml/java/Makefile.in
index 9bfd2b1..9057bae 100644
--- a/WebCore/khtml/java/Makefile.in
+++ b/WebCore/khtml/java/Makefile.in
@@ -25,6 +25,7 @@ SKIPOBJECTS = javaembed.o
CXXOBJECTS = $(filter-out $(SKIPOBJECTS),$(ALLOBJECTS))
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmljava.a
@@ -55,7 +56,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) export-objects
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/misc/.cvsignore b/WebCore/khtml/misc/.cvsignore
index 624a098..1385010 100644
--- a/WebCore/khtml/misc/.cvsignore
+++ b/WebCore/khtml/misc/.cvsignore
@@ -10,3 +10,4 @@ htmltags.gperf
htmlattrs.c
htmlattrs.h
htmlattrs.gperf
+export-objects
diff --git a/WebCore/khtml/misc/Makefile.in b/WebCore/khtml/misc/Makefile.in
index 59016f8..41b48f6 100644
--- a/WebCore/khtml/misc/Makefile.in
+++ b/WebCore/khtml/misc/Makefile.in
@@ -37,6 +37,7 @@ ATTRSFILES = \
CFILES = $(TAGFILES) $(ATTRSFILES)
OBJECTS = khtmldata.h $(CFILES) $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmlmisc.a
@@ -69,7 +70,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(CFILES) $(OBJECTS) $(LIBRARY)
+all: $(CFILES) $(OBJECTS) export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/rendering/.cvsignore b/WebCore/khtml/rendering/.cvsignore
index 39a4cb9..35b78ab 100644
--- a/WebCore/khtml/rendering/.cvsignore
+++ b/WebCore/khtml/rendering/.cvsignore
@@ -5,3 +5,4 @@ Makefile.in
*.dep
*.moc
*.gperf
+export-objects
diff --git a/WebCore/khtml/rendering/Makefile.in b/WebCore/khtml/rendering/Makefile.in
index 1797389..ca026b1 100644
--- a/WebCore/khtml/rendering/Makefile.in
+++ b/WebCore/khtml/rendering/Makefile.in
@@ -20,6 +20,7 @@ HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmlrendering.a
@@ -60,7 +61,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(LIBRARY) export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/xml/.cvsignore b/WebCore/khtml/xml/.cvsignore
index b31bca8..2e02a1b 100644
--- a/WebCore/khtml/xml/.cvsignore
+++ b/WebCore/khtml/xml/.cvsignore
@@ -4,3 +4,4 @@ Makefile.in
*.kde
*.dep
*.moc
+export-objects
diff --git a/WebCore/khtml/xml/Makefile.in b/WebCore/khtml/xml/Makefile.in
index a9f363c..3a1ec0e 100644
--- a/WebCore/khtml/xml/Makefile.in
+++ b/WebCore/khtml/xml/Makefile.in
@@ -36,6 +36,7 @@ CXXOBJECTS = \
$(NULL)
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmlxml.a
@@ -72,7 +73,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) export-objects
dom_docimpl.cpp: dom_docimpl.moc
dom_docimpl.moc:
diff --git a/WebCore/kwq/.cvsignore b/WebCore/kwq/.cvsignore
index d849331..34df4bd 100644
--- a/WebCore/kwq/.cvsignore
+++ b/WebCore/kwq/.cvsignore
@@ -1,2 +1,3 @@
Makefile
*.dummy
+export-objects
diff --git a/WebCore/kwq/KWQKCompletionBox.mm b/WebCore/kwq/KWQKCompletionBox.mm
index bd1d113..6a429e8 100644
--- a/WebCore/kwq/KWQKCompletionBox.mm
+++ b/WebCore/kwq/KWQKCompletionBox.mm
@@ -29,4 +29,6 @@ KCompletionBox::KCompletionBox()
{
}
-
+KCompletionBox::~KCompletionBox()
+{
+}
diff --git a/WebCore/kwq/Makefile.in b/WebCore/kwq/Makefile.in
index 142d491..8b802f4 100644
--- a/WebCore/kwq/Makefile.in
+++ b/WebCore/kwq/Makefile.in
@@ -125,6 +125,7 @@ MOBJECTS = \
$(NULL)
OBJECTS = $(MMOBJECTS) $(MOBJECTS)
+EXPORT_OBJECTS = $(OBJECTS)
LIBRARY = libkwq.a
@@ -175,7 +176,7 @@ DEPFLAGS = $(CMFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(OBJECTS)
diff --git a/WebCore/kwq/kde/.cvsignore b/WebCore/kwq/kde/.cvsignore
index f3c7a7c..26585a5 100644
--- a/WebCore/kwq/kde/.cvsignore
+++ b/WebCore/kwq/kde/.cvsignore
@@ -1 +1,2 @@
Makefile
+export-objects
diff --git a/WebCore/kwq/kde/Makefile.in b/WebCore/kwq/kde/Makefile.in
index 2b1becc..d8b8cd8 100644
--- a/WebCore/kwq/kde/Makefile.in
+++ b/WebCore/kwq/kde/Makefile.in
@@ -19,6 +19,7 @@ SOURCES = $(wildcard *.cpp)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = lib_kde.a
@@ -42,7 +43,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/kwq/qt/.cvsignore b/WebCore/kwq/qt/.cvsignore
index 823bec4..b57ad68 100644
--- a/WebCore/kwq/qt/.cvsignore
+++ b/WebCore/kwq/qt/.cvsignore
@@ -2,3 +2,4 @@
*.a
Makefile
Makefile.dep
+export-objects
diff --git a/WebCore/kwq/qt/Makefile.in b/WebCore/kwq/qt/Makefile.in
index 82e0aba..aaa1715 100644
--- a/WebCore/kwq/qt/Makefile.in
+++ b/WebCore/kwq/qt/Makefile.in
@@ -19,6 +19,7 @@ SOURCES = $(wildcard *.cpp)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = lib_qt.a
@@ -40,7 +41,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/.cvsignore b/WebCore/kwq/tests/draw/drawApp/drawApp.pbproj/.cvsignore
similarity index 100%
copy from WebCore/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/.cvsignore
copy to WebCore/kwq/tests/draw/drawApp/drawApp.pbproj/.cvsignore
diff --git a/WebCore/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj b/WebCore/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj
index f9d4fde..00756c5 100644
--- a/WebCore/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj
+++ b/WebCore/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj
@@ -116,6 +116,28 @@
//192
//193
//194
+//250
+//251
+//252
+//253
+//254
+ 251C98EA017CDDA10ECA149E = {
+ isa = PBXFileReference;
+ name = draw.mm;
+ path = ../draw.mm;
+ refType = 2;
+ };
+ 251C98EB017CDDA10ECA149E = {
+ fileRef = 251C98EA017CDDA10ECA149E;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+//250
+//251
+//252
+//253
+//254
//290
//291
//292
@@ -148,7 +170,7 @@
};
29B97315FDCFA39411CA2CEA = {
children = (
- 9C05E99F017653320ECA16EA,
+ 251C98EA017CDDA10ECA149E,
);
isa = PBXGroup;
name = "Other Sources";
@@ -216,9 +238,9 @@
FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS = "";
INSTALL_PATH = "$(HOME)/Applications";
- LIBRARY_SEARCH_PATHS = "";
+ LIBRARY_SEARCH_PATHS = ../../../../../lib;
OTHER_CFLAGS = "-DHAVE_CONFIG_H -DQT_NO_DATASTREAM -D_KWQ_ -I../../../qt -I../../.. -I../../../../..";
- OTHER_LDFLAGS = " -L../../.. -L../../../qt -lkwq -l_qt -lstdc++";
+ OTHER_LDFLAGS = "-lwebcore";
PRODUCT_NAME = drawApp;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
@@ -280,7 +302,7 @@
29B9732BFDCFA39411CA2CEA = {
buildActionMask = 2147483647;
files = (
- 9C05E9A0017653320ECA16EA,
+ 251C98EB017CDDA10ECA149E,
);
isa = PBXSourcesBuildPhase;
name = Sources;
@@ -368,18 +390,6 @@
settings = {
};
};
- 9C05E99F017653320ECA16EA = {
- isa = PBXFileReference;
- name = draw.mm;
- path = /Volumes/General/users/rjw/src/Labyrinth/WebCore/src/kwq/tests/draw/draw.mm;
- refType = 0;
- };
- 9C05E9A0017653320ECA16EA = {
- fileRef = 9C05E99F017653320ECA16EA;
- isa = PBXBuildFile;
- settings = {
- };
- };
};
rootObject = 29B97313FDCFA39411CA2CEA;
}
diff --git a/WebCore/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj b/WebCore/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
index 38cd361..8f7f88a 100644
--- a/WebCore/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
+++ b/WebCore/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
@@ -248,9 +248,9 @@
FRAMEWORK_SEARCH_PATHS = /Network/Servers/noether/homes/gandalf/kocienda/symroots;
HEADER_SEARCH_PATHS = "";
INSTALL_PATH = "$(HOME)/Applications";
- LIBRARY_SEARCH_PATHS = "";
+ LIBRARY_SEARCH_PATHS = ../../../../../lib;
OTHER_CFLAGS = "-DHAVE_CONFIG_H -DQT_NO_DATASTREAM -D_KWQ_ -I../../../qt -I../../.. -I../../../../.. -I../../../../kdelibs/khtml -I../../../../kwq/kdecore -I../../../../kwq/kde";
- OTHER_LDFLAGS = "-L../../../../.. -L../../.. -L../../../kde -L../../../qt -lkde -lkwq -l_kde -l_qt -lstdc++ -lkde -ljpeg";
+ OTHER_LDFLAGS = "-lwebcore";
PRODUCT_NAME = WebViewTest;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
diff --git a/WebCore/kwq/tests/qt/Makefile.in b/WebCore/kwq/tests/qt/Makefile.in
index 6475a28..3ac7bca 100644
--- a/WebCore/kwq/tests/qt/Makefile.in
+++ b/WebCore/kwq/tests/qt/Makefile.in
@@ -62,15 +62,11 @@ CMMFLAGS = $(BASECMMFLAGS)
LIBS = objc-dummy.o \
-framework Cocoa \
- -lkwq \
- -l_qt \
- -lkwq \
- -l_qt \
+ -lwebcore \
$(NULL)
LDFLAGS = $(BASELDFLAGS) \
- -L../.. \
- -L../../qt \
+ -L$(TOPSRCDIR)/lib \
$(NULL)
DEPFLAGS = $(CXXFLAGS)
diff --git a/WebCore/src/kdelibs/khtml/.cvsignore b/WebCore/src/kdelibs/khtml/.cvsignore
index 2e72928..6bf3bf6 100644
--- a/WebCore/src/kdelibs/khtml/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/.cvsignore
@@ -8,3 +8,4 @@ SunWS_cache
ir.out
testkhtml_static
*.moc
+export-objects
diff --git a/WebCore/src/kdelibs/khtml/Makefile.in b/WebCore/src/kdelibs/khtml/Makefile.in
index 3cb88e1..335eafc 100644
--- a/WebCore/src/kdelibs/khtml/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/Makefile.in
@@ -23,6 +23,7 @@ CXXOBJECTS = \
$(NULL)
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtml.a
@@ -60,7 +61,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/css/.cvsignore b/WebCore/src/kdelibs/khtml/css/.cvsignore
index bc205c3..687f319 100644
--- a/WebCore/src/kdelibs/khtml/css/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/css/.cvsignore
@@ -11,3 +11,4 @@ cssvalues.h
cssproperties.c
cssproperties.strip
cssproperties.h
+export-objects
diff --git a/WebCore/src/kdelibs/khtml/css/Makefile.in b/WebCore/src/kdelibs/khtml/css/Makefile.in
index 295171c..26c8e91 100644
--- a/WebCore/src/kdelibs/khtml/css/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/css/Makefile.in
@@ -43,6 +43,7 @@ PROPFILES = \
CFILES = $(VALUEFILES) $(PROPFILES)
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmlcss.a
@@ -78,7 +79,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(CFILES) $(OBJECTS) $(LIBRARY)
+all: $(CFILES) $(OBJECTS) export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/dom/.cvsignore b/WebCore/src/kdelibs/khtml/dom/.cvsignore
index 4a22210..def1ee8 100644
--- a/WebCore/src/kdelibs/khtml/dom/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/dom/.cvsignore
@@ -2,3 +2,4 @@ Makefile
Makefile.in
*.kde
*.dep
+export-objects
diff --git a/WebCore/src/kdelibs/khtml/dom/Makefile.in b/WebCore/src/kdelibs/khtml/dom/Makefile.in
index 44797c2..58f8c3b 100644
--- a/WebCore/src/kdelibs/khtml/dom/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/dom/Makefile.in
@@ -23,6 +23,7 @@ HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmldom.a
@@ -56,7 +57,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) export-objects
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/ecma/.cvsignore b/WebCore/src/kdelibs/khtml/ecma/.cvsignore
index 39a4cb9..35b78ab 100644
--- a/WebCore/src/kdelibs/khtml/ecma/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/ecma/.cvsignore
@@ -5,3 +5,4 @@ Makefile.in
*.dep
*.moc
*.gperf
+export-objects
diff --git a/WebCore/src/kdelibs/khtml/ecma/Makefile.in b/WebCore/src/kdelibs/khtml/ecma/Makefile.in
index 6794638..a02a9d1 100644
--- a/WebCore/src/kdelibs/khtml/ecma/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/ecma/Makefile.in
@@ -20,6 +20,7 @@ HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(filter-out testecma.o,$(CXXOBJECTS))
LIBRARY = libkhtmlecma.a
@@ -56,7 +57,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(LIBRARY) export-objects
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/html/.cvsignore b/WebCore/src/kdelibs/khtml/html/.cvsignore
index 0197895..9769007 100644
--- a/WebCore/src/kdelibs/khtml/html/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/html/.cvsignore
@@ -3,3 +3,4 @@ Makefile.in
*.dep
*.moc
*.kde
+export-objects
diff --git a/WebCore/src/kdelibs/khtml/html/Makefile.in b/WebCore/src/kdelibs/khtml/html/Makefile.in
index 9ee41d8..881e406 100644
--- a/WebCore/src/kdelibs/khtml/html/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/html/Makefile.in
@@ -20,6 +20,7 @@ HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmlhtml.a
@@ -58,7 +59,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/java/.cvsignore b/WebCore/src/kdelibs/khtml/java/.cvsignore
index b31bca8..2e02a1b 100644
--- a/WebCore/src/kdelibs/khtml/java/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/java/.cvsignore
@@ -4,3 +4,4 @@ Makefile.in
*.kde
*.dep
*.moc
+export-objects
diff --git a/WebCore/src/kdelibs/khtml/java/Makefile.in b/WebCore/src/kdelibs/khtml/java/Makefile.in
index 9bfd2b1..9057bae 100644
--- a/WebCore/src/kdelibs/khtml/java/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/java/Makefile.in
@@ -25,6 +25,7 @@ SKIPOBJECTS = javaembed.o
CXXOBJECTS = $(filter-out $(SKIPOBJECTS),$(ALLOBJECTS))
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmljava.a
@@ -55,7 +56,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) export-objects
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/misc/.cvsignore b/WebCore/src/kdelibs/khtml/misc/.cvsignore
index 624a098..1385010 100644
--- a/WebCore/src/kdelibs/khtml/misc/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/misc/.cvsignore
@@ -10,3 +10,4 @@ htmltags.gperf
htmlattrs.c
htmlattrs.h
htmlattrs.gperf
+export-objects
diff --git a/WebCore/src/kdelibs/khtml/misc/Makefile.in b/WebCore/src/kdelibs/khtml/misc/Makefile.in
index 59016f8..41b48f6 100644
--- a/WebCore/src/kdelibs/khtml/misc/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/misc/Makefile.in
@@ -37,6 +37,7 @@ ATTRSFILES = \
CFILES = $(TAGFILES) $(ATTRSFILES)
OBJECTS = khtmldata.h $(CFILES) $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmlmisc.a
@@ -69,7 +70,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(CFILES) $(OBJECTS) $(LIBRARY)
+all: $(CFILES) $(OBJECTS) export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/rendering/.cvsignore b/WebCore/src/kdelibs/khtml/rendering/.cvsignore
index 39a4cb9..35b78ab 100644
--- a/WebCore/src/kdelibs/khtml/rendering/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/rendering/.cvsignore
@@ -5,3 +5,4 @@ Makefile.in
*.dep
*.moc
*.gperf
+export-objects
diff --git a/WebCore/src/kdelibs/khtml/rendering/Makefile.in b/WebCore/src/kdelibs/khtml/rendering/Makefile.in
index 1797389..ca026b1 100644
--- a/WebCore/src/kdelibs/khtml/rendering/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/rendering/Makefile.in
@@ -20,6 +20,7 @@ HEADERS = $(wildcard *.h)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmlrendering.a
@@ -60,7 +61,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(LIBRARY) export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/xml/.cvsignore b/WebCore/src/kdelibs/khtml/xml/.cvsignore
index b31bca8..2e02a1b 100644
--- a/WebCore/src/kdelibs/khtml/xml/.cvsignore
+++ b/WebCore/src/kdelibs/khtml/xml/.cvsignore
@@ -4,3 +4,4 @@ Makefile.in
*.kde
*.dep
*.moc
+export-objects
diff --git a/WebCore/src/kdelibs/khtml/xml/Makefile.in b/WebCore/src/kdelibs/khtml/xml/Makefile.in
index a9f363c..3a1ec0e 100644
--- a/WebCore/src/kdelibs/khtml/xml/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/xml/Makefile.in
@@ -36,6 +36,7 @@ CXXOBJECTS = \
$(NULL)
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = libkhtmlxml.a
@@ -72,7 +73,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) export-objects
dom_docimpl.cpp: dom_docimpl.moc
dom_docimpl.moc:
diff --git a/WebCore/src/kdelibs/kjs/.cvsignore b/WebCore/src/kdelibs/kjs/.cvsignore
index 59e1be0..cf0d15c 100644
--- a/WebCore/src/kdelibs/kjs/.cvsignore
+++ b/WebCore/src/kdelibs/kjs/.cvsignore
@@ -10,3 +10,4 @@ grammar.cpp.h
grammar.h
*.kde
*.dep
+export-objects
diff --git a/WebCore/src/kdelibs/kjs/Makefile.in b/WebCore/src/kdelibs/kjs/Makefile.in
index ca8efde..c8b5f1c 100644
--- a/WebCore/src/kdelibs/kjs/Makefile.in
+++ b/WebCore/src/kdelibs/kjs/Makefile.in
@@ -73,7 +73,9 @@ CXXOBJECTS = \
PROGRAM = testkjs
-OBJECTS = $(CXXYACCOBJECTS) $(CXXOBJECTS)
+OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/lib/kjs
LIBRARY = libkjs.a
@@ -94,7 +96,7 @@ YACCFLAGS = -d --output-file=grammar.cpp --name-prefix=kjsyy
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY) $(PROGRAM)
+all: $(CXXYACCOBJECTS) $(OBJECTS) $(LIBRARY) $(PROGRAM) export-objects
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kwq/.cvsignore b/WebCore/src/kwq/.cvsignore
index d849331..34df4bd 100644
--- a/WebCore/src/kwq/.cvsignore
+++ b/WebCore/src/kwq/.cvsignore
@@ -1,2 +1,3 @@
Makefile
*.dummy
+export-objects
diff --git a/WebCore/src/kwq/KWQKCompletionBox.mm b/WebCore/src/kwq/KWQKCompletionBox.mm
index bd1d113..6a429e8 100644
--- a/WebCore/src/kwq/KWQKCompletionBox.mm
+++ b/WebCore/src/kwq/KWQKCompletionBox.mm
@@ -29,4 +29,6 @@ KCompletionBox::KCompletionBox()
{
}
-
+KCompletionBox::~KCompletionBox()
+{
+}
diff --git a/WebCore/src/kwq/Makefile.in b/WebCore/src/kwq/Makefile.in
index 142d491..8b802f4 100644
--- a/WebCore/src/kwq/Makefile.in
+++ b/WebCore/src/kwq/Makefile.in
@@ -125,6 +125,7 @@ MOBJECTS = \
$(NULL)
OBJECTS = $(MMOBJECTS) $(MOBJECTS)
+EXPORT_OBJECTS = $(OBJECTS)
LIBRARY = libkwq.a
@@ -175,7 +176,7 @@ DEPFLAGS = $(CMFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(OBJECTS)
diff --git a/WebCore/src/kwq/kde/.cvsignore b/WebCore/src/kwq/kde/.cvsignore
index f3c7a7c..26585a5 100644
--- a/WebCore/src/kwq/kde/.cvsignore
+++ b/WebCore/src/kwq/kde/.cvsignore
@@ -1 +1,2 @@
Makefile
+export-objects
diff --git a/WebCore/src/kwq/kde/Makefile.in b/WebCore/src/kwq/kde/Makefile.in
index 2b1becc..d8b8cd8 100644
--- a/WebCore/src/kwq/kde/Makefile.in
+++ b/WebCore/src/kwq/kde/Makefile.in
@@ -19,6 +19,7 @@ SOURCES = $(wildcard *.cpp)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = lib_kde.a
@@ -42,7 +43,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kwq/qt/.cvsignore b/WebCore/src/kwq/qt/.cvsignore
index 823bec4..b57ad68 100644
--- a/WebCore/src/kwq/qt/.cvsignore
+++ b/WebCore/src/kwq/qt/.cvsignore
@@ -2,3 +2,4 @@
*.a
Makefile
Makefile.dep
+export-objects
diff --git a/WebCore/src/kwq/qt/Makefile.in b/WebCore/src/kwq/qt/Makefile.in
index 82e0aba..aaa1715 100644
--- a/WebCore/src/kwq/qt/Makefile.in
+++ b/WebCore/src/kwq/qt/Makefile.in
@@ -19,6 +19,7 @@ SOURCES = $(wildcard *.cpp)
CXXOBJECTS = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJECTS = $(CXXOBJECTS)
+EXPORT_OBJECTS = $(CXXOBJECTS)
LIBRARY = lib_qt.a
@@ -40,7 +41,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/.cvsignore b/WebCore/src/kwq/tests/draw/drawApp/drawApp.pbproj/.cvsignore
similarity index 100%
copy from WebCore/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/.cvsignore
copy to WebCore/src/kwq/tests/draw/drawApp/drawApp.pbproj/.cvsignore
diff --git a/WebCore/src/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj b/WebCore/src/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj
index f9d4fde..00756c5 100644
--- a/WebCore/src/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj
+++ b/WebCore/src/kwq/tests/draw/drawApp/drawApp.pbproj/project.pbxproj
@@ -116,6 +116,28 @@
//192
//193
//194
+//250
+//251
+//252
+//253
+//254
+ 251C98EA017CDDA10ECA149E = {
+ isa = PBXFileReference;
+ name = draw.mm;
+ path = ../draw.mm;
+ refType = 2;
+ };
+ 251C98EB017CDDA10ECA149E = {
+ fileRef = 251C98EA017CDDA10ECA149E;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+//250
+//251
+//252
+//253
+//254
//290
//291
//292
@@ -148,7 +170,7 @@
};
29B97315FDCFA39411CA2CEA = {
children = (
- 9C05E99F017653320ECA16EA,
+ 251C98EA017CDDA10ECA149E,
);
isa = PBXGroup;
name = "Other Sources";
@@ -216,9 +238,9 @@
FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS = "";
INSTALL_PATH = "$(HOME)/Applications";
- LIBRARY_SEARCH_PATHS = "";
+ LIBRARY_SEARCH_PATHS = ../../../../../lib;
OTHER_CFLAGS = "-DHAVE_CONFIG_H -DQT_NO_DATASTREAM -D_KWQ_ -I../../../qt -I../../.. -I../../../../..";
- OTHER_LDFLAGS = " -L../../.. -L../../../qt -lkwq -l_qt -lstdc++";
+ OTHER_LDFLAGS = "-lwebcore";
PRODUCT_NAME = drawApp;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
@@ -280,7 +302,7 @@
29B9732BFDCFA39411CA2CEA = {
buildActionMask = 2147483647;
files = (
- 9C05E9A0017653320ECA16EA,
+ 251C98EB017CDDA10ECA149E,
);
isa = PBXSourcesBuildPhase;
name = Sources;
@@ -368,18 +390,6 @@
settings = {
};
};
- 9C05E99F017653320ECA16EA = {
- isa = PBXFileReference;
- name = draw.mm;
- path = /Volumes/General/users/rjw/src/Labyrinth/WebCore/src/kwq/tests/draw/draw.mm;
- refType = 0;
- };
- 9C05E9A0017653320ECA16EA = {
- fileRef = 9C05E99F017653320ECA16EA;
- isa = PBXBuildFile;
- settings = {
- };
- };
};
rootObject = 29B97313FDCFA39411CA2CEA;
}
diff --git a/WebCore/src/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj b/WebCore/src/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
index 38cd361..8f7f88a 100644
--- a/WebCore/src/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
+++ b/WebCore/src/kwq/tests/khtmlview/WebViewTest/WebViewTest.pbproj/project.pbxproj
@@ -248,9 +248,9 @@
FRAMEWORK_SEARCH_PATHS = /Network/Servers/noether/homes/gandalf/kocienda/symroots;
HEADER_SEARCH_PATHS = "";
INSTALL_PATH = "$(HOME)/Applications";
- LIBRARY_SEARCH_PATHS = "";
+ LIBRARY_SEARCH_PATHS = ../../../../../lib;
OTHER_CFLAGS = "-DHAVE_CONFIG_H -DQT_NO_DATASTREAM -D_KWQ_ -I../../../qt -I../../.. -I../../../../.. -I../../../../kdelibs/khtml -I../../../../kwq/kdecore -I../../../../kwq/kde";
- OTHER_LDFLAGS = "-L../../../../.. -L../../.. -L../../../kde -L../../../qt -lkde -lkwq -l_kde -l_qt -lstdc++ -lkde -ljpeg";
+ OTHER_LDFLAGS = "-lwebcore";
PRODUCT_NAME = WebViewTest;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
diff --git a/WebCore/src/kwq/tests/qt/Makefile.in b/WebCore/src/kwq/tests/qt/Makefile.in
index 6475a28..3ac7bca 100644
--- a/WebCore/src/kwq/tests/qt/Makefile.in
+++ b/WebCore/src/kwq/tests/qt/Makefile.in
@@ -62,15 +62,11 @@ CMMFLAGS = $(BASECMMFLAGS)
LIBS = objc-dummy.o \
-framework Cocoa \
- -lkwq \
- -l_qt \
- -lkwq \
- -l_qt \
+ -lwebcore \
$(NULL)
LDFLAGS = $(BASELDFLAGS) \
- -L../.. \
- -L../../qt \
+ -L$(TOPSRCDIR)/lib \
$(NULL)
DEPFLAGS = $(CXXFLAGS)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list