[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:44:45 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7cc5b5decdc09dbea336e98a86d554351a249d72
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 10 18:09:08 2001 +0000
Updated the make system with improved handling of dependency generation
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@124 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/Makefile.rules.in b/WebCore/Makefile.rules.in
index 0b66149..3b4eb5d 100644
--- a/WebCore/Makefile.rules.in
+++ b/WebCore/Makefile.rules.in
@@ -42,6 +42,9 @@ setup:
./MakeSystemChanges.sh; \
fi
+depend:
+ $(CC) -MM $(DEPFLAGS) $(SOURCES) > Makefile.dep
+
clean:
rm -f ${CLEAN_FILES} core
@@ -58,6 +61,11 @@ maintainer-clean:
rm -f configure
${MAKE} distclean;
+#----------------------------------------------------------------------
+# include make dependency rules
+
+-include Makefile.dep
+
#======================================================================
# end $RCSfile$
#======================================================================
diff --git a/WebCore/Makefile.vars.in b/WebCore/Makefile.vars.in
index 33e4396..a2a48bd 100644
--- a/WebCore/Makefile.vars.in
+++ b/WebCore/Makefile.vars.in
@@ -54,6 +54,8 @@ LDFLAGS = $(BASELDFLAGS)
YACCFLAGS = $(BASEYACCFLAGS)
LEXFLAGS = $(BASELEXFLAGS)
+DEPFLAGS = $(BASECXXFLAGS)
+
#======================================================================
# end $RCSfile$
#======================================================================
diff --git a/WebCore/config.h.in b/WebCore/config.h.in
index 177683a..dbe3140 100644
--- a/WebCore/config.h.in
+++ b/WebCore/config.h.in
@@ -1,4 +1,9 @@
-/* config.h.in. Generated automatically from configure.in by autoheader. */
+/* Define for compiling in KWQ land */
+#undef _KWQ_
+
+/* Define for compiling in pedantic KWQ land */
+/* This adds pendantic C++ declarations to KDE/QT C++ code */
+#undef _KWQ_PEDANTIC_
/* Define if using alloca.c. */
#undef C_ALLOCA
diff --git a/WebCore/configure b/WebCore/configure
index 2e563d1..0f0dcd3 100644
--- a/WebCore/configure
+++ b/WebCore/configure
@@ -11,6 +11,8 @@
ac_help=
ac_default_prefix=/usr/local
# Any additions from configure.in:
+ac_help="$ac_help
+--enable-kwq-pedantic enables pedantic declarations in KWQ code"
# Initialize some variables set by options.
# The variables have the same names as the options, with
@@ -608,7 +610,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:612: checking host system type" >&5
+echo "configure:614: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -639,7 +641,7 @@ esac
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:643: checking for $ac_word" >&5
+echo "configure:645: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -669,7 +671,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:673: checking for $ac_word" >&5
+echo "configure:675: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -720,7 +722,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:724: checking for $ac_word" >&5
+echo "configure:726: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -752,7 +754,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:756: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:758: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -763,12 +765,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 767 "configure"
+#line 769 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -794,12 +796,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:798: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:800: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:803: checking whether we are using GNU C" >&5
+echo "configure:805: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -808,7 +810,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -827,7 +829,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:831: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:833: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -868,7 +870,7 @@ CXXFLAGS=$CFLAGS
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:872: checking how to run the C preprocessor" >&5
+echo "configure:874: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -883,13 +885,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 887 "configure"
+#line 889 "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:893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:895: \"$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
:
@@ -900,13 +902,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 904 "configure"
+#line 906 "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:910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:912: \"$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
:
@@ -917,13 +919,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 921 "configure"
+#line 923 "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:927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:929: \"$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
:
@@ -950,7 +952,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:954: checking for $ac_word" >&5
+echo "configure:956: 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
@@ -984,7 +986,7 @@ then
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:988: checking for yywrap in -l$ac_lib" >&5
+echo "configure:990: 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
@@ -992,7 +994,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 996 "configure"
+#line 998 "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
@@ -1003,7 +1005,7 @@ int main() {
yywrap()
; return 0; }
EOF
-if { (eval echo configure:1007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1009: \"$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
@@ -1026,7 +1028,7 @@ fi
fi
echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:1030: checking lex output file root" >&5
+echo "configure:1032: 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
@@ -1047,7 +1049,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:1051: checking whether yytext is a pointer" >&5
+echo "configure:1053: 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
@@ -1059,14 +1061,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LEXLIB"
cat > conftest.$ac_ext <<EOF
-#line 1063 "configure"
+#line 1065 "configure"
#include "confdefs.h"
`cat $LEX_OUTPUT_ROOT.c`
int main() {
; return 0; }
EOF
-if { (eval echo configure:1070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1072: \"$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
@@ -1092,7 +1094,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:1096: checking for $ac_word" >&5
+echo "configure:1098: 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
@@ -1133,7 +1135,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:1137: checking for $ac_word" >&5
+echo "configure:1139: 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
@@ -1172,7 +1174,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:1176: checking for $ac_word" >&5
+echo "configure:1178: 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
@@ -1208,7 +1210,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:1212: checking for $ac_word" >&5
+echo "configure:1214: 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
@@ -1245,7 +1247,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:1249: checking for $ac_word" >&5
+echo "configure:1251: 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
@@ -1280,7 +1282,7 @@ if test -z "$ac_cv_prog_SED"; then
fi
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1284: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1286: 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
@@ -1318,7 +1320,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:1322: checking for a BSD compatible install" >&5
+echo "configure:1324: 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
@@ -1397,12 +1399,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:1401: checking for $ac_hdr that defines DIR" >&5
+echo "configure:1403: 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 1406 "configure"
+#line 1408 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -1410,7 +1412,7 @@ int main() {
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:1414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -1435,7 +1437,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:1439: checking for opendir in -ldir" >&5
+echo "configure:1441: 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
@@ -1443,7 +1445,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1447 "configure"
+#line 1449 "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
@@ -1454,7 +1456,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:1458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1460: \"$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
@@ -1476,7 +1478,7 @@ fi
else
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1480: checking for opendir in -lx" >&5
+echo "configure:1482: 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
@@ -1484,7 +1486,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1488 "configure"
+#line 1490 "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
@@ -1495,7 +1497,7 @@ int main() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:1499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1501: \"$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
@@ -1518,12 +1520,12 @@ fi
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1522: checking for ANSI C header files" >&5
+echo "configure:1524: 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 1527 "configure"
+#line 1529 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1531,7 +1533,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1537: \"$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*
@@ -1548,7 +1550,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 1552 "configure"
+#line 1554 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1566,7 +1568,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 1570 "configure"
+#line 1572 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1587,7 +1589,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1591 "configure"
+#line 1593 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1598,7 +1600,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:1602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1625,17 +1627,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:1629: checking for $ac_hdr" >&5
+echo "configure:1631: 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 1634 "configure"
+#line 1636 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1641: \"$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*
@@ -1665,17 +1667,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:1669: checking for $ac_hdr" >&5
+echo "configure:1671: 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 1674 "configure"
+#line 1676 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1681: \"$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*
@@ -1705,17 +1707,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:1709: checking for $ac_hdr" >&5
+echo "configure:1711: 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 1714 "configure"
+#line 1716 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1721: \"$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*
@@ -1745,17 +1747,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:1749: checking for $ac_hdr" >&5
+echo "configure:1751: 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 1754 "configure"
+#line 1756 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1761: \"$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*
@@ -1784,7 +1786,7 @@ done
echo $ac_n "checking for jpeg_mem_init in -ljpeg""... $ac_c" 1>&6
-echo "configure:1788: checking for jpeg_mem_init in -ljpeg" >&5
+echo "configure:1790: 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
@@ -1792,7 +1794,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ljpeg $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1796 "configure"
+#line 1798 "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
@@ -1803,7 +1805,7 @@ int main() {
jpeg_mem_init()
; return 0; }
EOF
-if { (eval echo configure:1807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1809: \"$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
@@ -1833,12 +1835,12 @@ fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1837: checking for working const" >&5
+echo "configure:1839: 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 1842 "configure"
+#line 1844 "configure"
#include "confdefs.h"
int main() {
@@ -1887,7 +1889,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:1891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1908,21 +1910,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1912: checking for inline" >&5
+echo "configure:1914: 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 1919 "configure"
+#line 1921 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:1926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -1948,12 +1950,12 @@ EOF
esac
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1952: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1954: 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 1957 "configure"
+#line 1959 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -1962,7 +1964,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:1966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -1987,12 +1989,12 @@ fi
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:1991: checking for $ac_func" >&5
+echo "configure:1993: 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 1996 "configure"
+#line 1998 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2015,7 +2017,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2021: \"$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
@@ -2048,12 +2050,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:2052: checking for pid_t" >&5
+echo "configure:2054: 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 2057 "configure"
+#line 2059 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -2082,17 +2084,17 @@ fi
ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:2086: checking for vfork.h" >&5
+echo "configure:2088: 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 2091 "configure"
+#line 2093 "configure"
#include "confdefs.h"
#include <vfork.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2098: \"$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*
@@ -2117,18 +2119,18 @@ else
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:2121: checking for working vfork" >&5
+echo "configure:2123: 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:2127: checking for vfork" >&5
+echo "configure:2129: 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 2132 "configure"
+#line 2134 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vfork(); below. */
@@ -2151,7 +2153,7 @@ vfork();
; return 0; }
EOF
-if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2157: \"$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
@@ -2173,7 +2175,7 @@ fi
ac_cv_func_vfork_works=$ac_cv_func_vfork
else
cat > conftest.$ac_ext <<EOF
-#line 2177 "configure"
+#line 2179 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
@@ -2268,7 +2270,7 @@ main() {
}
}
EOF
-if { (eval echo configure:2272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2274: \"$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
@@ -2295,17 +2297,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:2299: checking for $ac_hdr" >&5
+echo "configure:2301: 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 2304 "configure"
+#line 2306 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2311: \"$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*
@@ -2332,7 +2334,7 @@ fi
done
echo $ac_n "checking for isinf in -lm""... $ac_c" 1>&6
-echo "configure:2336: checking for isinf in -lm" >&5
+echo "configure:2338: 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
@@ -2340,7 +2342,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2344 "configure"
+#line 2346 "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
@@ -2351,7 +2353,7 @@ int main() {
isinf()
; return 0; }
EOF
-if { (eval echo configure:2355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2357: \"$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
@@ -2377,7 +2379,7 @@ else
fi
echo $ac_n "checking for finite in -lm""... $ac_c" 1>&6
-echo "configure:2381: checking for finite in -lm" >&5
+echo "configure:2383: 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
@@ -2385,7 +2387,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2389 "configure"
+#line 2391 "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
@@ -2396,7 +2398,7 @@ int main() {
finite()
; return 0; }
EOF
-if { (eval echo configure:2400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2402: \"$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
@@ -2422,7 +2424,7 @@ else
fi
echo $ac_n "checking for _finite in -lm""... $ac_c" 1>&6
-echo "configure:2426: checking for _finite in -lm" >&5
+echo "configure:2428: 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
@@ -2430,7 +2432,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2434 "configure"
+#line 2436 "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
@@ -2441,7 +2443,7 @@ int main() {
_finite()
; return 0; }
EOF
-if { (eval echo configure:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2447: \"$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
@@ -2467,7 +2469,7 @@ else
fi
echo $ac_n "checking for isnan in -lm""... $ac_c" 1>&6
-echo "configure:2471: checking for isnan in -lm" >&5
+echo "configure:2473: 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
@@ -2475,7 +2477,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2479 "configure"
+#line 2481 "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
@@ -2486,7 +2488,7 @@ int main() {
isnan()
; return 0; }
EOF
-if { (eval echo configure:2490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2492: \"$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
@@ -2514,6 +2516,31 @@ fi
+cat >> confdefs.h <<EOF
+#define _KWQ_ 1
+EOF
+
+
+# Check whether --enable-kwq-pedantic or --disable-kwq-pedantic was given.
+if test "${enable_kwq_pedantic+set}" = set; then
+ enableval="$enable_kwq_pedantic"
+ if ( test "$enableval" = "yes" ); then
+ cat >> confdefs.h <<EOF
+#define _KWQ_PEDANTIC_ 1
+EOF
+
+ fi
+
+else
+ cat >> confdefs.h <<EOF
+#define _KWQ_PEDANTIC_ 1
+EOF
+
+
+fi
+
+
+
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
diff --git a/WebCore/configure.in b/WebCore/configure.in
index 1f1de54..24d02c6 100644
--- a/WebCore/configure.in
+++ b/WebCore/configure.in
@@ -196,6 +196,23 @@ dnl AC_CHECK_RANDOM
dnl
dnl -------------------------------------------------------------------
+dnl Special tweaks for our environment
+dnl -------------------------------------------------------------------
+dnl
+
+dnl Define _KWQ_ to get hacks we've made to KDE/QT
+AC_DEFINE_UNQUOTED(_KWQ_, 1)
+
+AC_ARG_ENABLE(kwq-pedantic,--enable-kwq-pedantic enables pedantic declarations in KWQ code,
+ if ( test "$enableval" = "yes" ); then
+ AC_DEFINE_UNQUOTED(_KWQ_PEDANTIC_, 1)
+ fi
+ ,
+ AC_DEFINE_UNQUOTED(_KWQ_PEDANTIC_, 1)
+)
+
+dnl
+dnl -------------------------------------------------------------------
dnl Output files
dnl -------------------------------------------------------------------
dnl
diff --git a/WebCore/khtml/css/Makefile.in.apple b/WebCore/khtml/css/Makefile.in.apple
index b31bd9a..6d7b75b 100644
--- a/WebCore/khtml/css/Makefile.in.apple
+++ b/WebCore/khtml/css/Makefile.in.apple
@@ -65,6 +65,8 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I. \
$(NULL)
+DEPFLAGS = $(CXXFLAGS)
+
#----------------------------------------------------------------------
# Set targets for this directory
@@ -80,16 +82,6 @@ $(VALUEFILES):
$(PROPFILES):
sh ./makeprop
-depend: Makefile.dep
-
-Makefile.dep: $(SOURCES) $(HEADERS)
- $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
-
-#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/khtml/dom/Makefile.in.apple b/WebCore/khtml/dom/Makefile.in.apple
index e75f26a..fa6e5c6 100644
--- a/WebCore/khtml/dom/Makefile.in.apple
+++ b/WebCore/khtml/dom/Makefile.in.apple
@@ -50,6 +50,8 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I. \
$(NULL)
+DEPFLAGS = $(CXXFLAGS)
+
#----------------------------------------------------------------------
# Set targets for this directory
@@ -59,16 +61,6 @@ $(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend: Makefile.dep
-
-Makefile.dep: $(SOURCES) $(HEADERS)
- $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
-
-#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/khtml/ecma/Makefile.in.apple b/WebCore/khtml/ecma/Makefile.in.apple
index 7f39701..4324305 100644
--- a/WebCore/khtml/ecma/Makefile.in.apple
+++ b/WebCore/khtml/ecma/Makefile.in.apple
@@ -50,6 +50,8 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I. \
$(NULL)
+DEPFLAGS = $(CXXFLAGS)
+
#----------------------------------------------------------------------
# Set targets for this directory
@@ -62,21 +64,11 @@ $(LIBRARY): $(CXXOBJECTS)
$(PROGRAM): testecma.o
$(CC) -o $@ $< -L. -lkhtmlecma
-depend: Makefile.dep
-
-Makefile.dep: $(SOURCES) $(HEADERS)
- $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
-
kjs_window.cpp: kjs_window.moc
kjs_window.moc:
touch $@
#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
-#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/khtml/html/Makefile.in.apple b/WebCore/khtml/html/Makefile.in.apple
index 4eff431..4880c11 100644
--- a/WebCore/khtml/html/Makefile.in.apple
+++ b/WebCore/khtml/html/Makefile.in.apple
@@ -51,20 +51,17 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I$(TOPSRCDIR) \
$(NULL)
+DEPFLAGS = $(CXXFLAGS)
+
#----------------------------------------------------------------------
# Set targets for this directory
-all: Makefile.dep $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend: Makefile.dep
-
-Makefile.dep: $(SOURCES) $(HEADERS)
- $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
-
htmltokenizer.cpp: htmltokenizer.moc
htmltokenizer.moc:
touch $@
@@ -74,11 +71,6 @@ html_documentimpl.moc:
touch $@
#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
-#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/khtml/java/Makefile.in.apple b/WebCore/khtml/java/Makefile.in.apple
index 8f27571..8e96b68 100644
--- a/WebCore/khtml/java/Makefile.in.apple
+++ b/WebCore/khtml/java/Makefile.in.apple
@@ -43,6 +43,8 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I. \
$(NULL)
+DEPFLAGS = $(CXXFLAGS)
+
#----------------------------------------------------------------------
# Set targets for this directory
@@ -52,11 +54,6 @@ $(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend: Makefile.dep
-
-Makefile.dep: $(SOURCES) $(HEADERS)
- $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
-
kjavaapplet.cpp: kjavaapplet.moc
kjavaapplet.moc:
touch $@
@@ -82,11 +79,6 @@ kjavaprocess.moc:
touch $@
#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
-#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/khtml/misc/Makefile.in.apple b/WebCore/khtml/misc/Makefile.in.apple
index 9e03dc0..2d33b07 100644
--- a/WebCore/khtml/misc/Makefile.in.apple
+++ b/WebCore/khtml/misc/Makefile.in.apple
@@ -63,6 +63,8 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I. \
$(NULL)
+DEPFLAGS = $(CXXFLAGS)
+
#----------------------------------------------------------------------
# Set targets for this directory
@@ -72,11 +74,6 @@ $(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend: Makefile.dep
-
-Makefile.dep: $(SOURCES) $(HEADERS)
- $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
-
loader.cpp: loader.moc
loader.moc:
touch loader.moc
@@ -91,11 +88,6 @@ $(ATTRSFILES):
./makeattrs
#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
-#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/khtml/rendering/Makefile.in.apple b/WebCore/khtml/rendering/Makefile.in.apple
index 15eba4c..7b190b7 100644
--- a/WebCore/khtml/rendering/Makefile.in.apple
+++ b/WebCore/khtml/rendering/Makefile.in.apple
@@ -54,6 +54,8 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I$(TOPSRCDIR) \
$(NULL)
+DEPFLAGS = $(CXXFLAGS)
+
#----------------------------------------------------------------------
# Set targets for this directory
@@ -63,11 +65,6 @@ $(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend: Makefile.dep
-
-Makefile.dep: $(SOURCES) $(HEADERS)
- $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
-
render_form.cpp: render_form.moc
render_form.moc:
touch $@
@@ -81,11 +78,6 @@ render_replaced.moc:
touch $@
#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
-#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/khtml/xml/Makefile.in.apple b/WebCore/khtml/xml/Makefile.in.apple
index 750bc5c..e57416f 100644
--- a/WebCore/khtml/xml/Makefile.in.apple
+++ b/WebCore/khtml/xml/Makefile.in.apple
@@ -61,16 +61,13 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I. \
$(NULL)
+DEPFLAGS = $(CXXFLAGS)
+
#----------------------------------------------------------------------
# Set targets for this directory
all: $(OBJECTS) $(LIBRARY)
-depend: Makefile.dep
-
-Makefile.dep: $(SOURCES) $(HEADERS)
- $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
-
dom_docimpl.cpp: dom_docimpl.moc
dom_docimpl.moc:
touch $@
@@ -83,11 +80,6 @@ $(LIBRARY): $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
-#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/kwq/KWQDCOPClient.h b/WebCore/kwq/KWQDCOPClient.h
index e8a7d24..470177e 100644
--- a/WebCore/kwq/KWQDCOPClient.h
+++ b/WebCore/kwq/KWQDCOPClient.h
@@ -43,7 +43,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
DCOPClient();
-
virtual ~DCOPClient();
// member functions --------------------------------------------------------
@@ -68,9 +67,13 @@ public:
// private ---------------------------------------------------------------------
private:
+
+// add copy constructor and assignment operator
+#ifdef KWQ_PEDANTIC
// no copying or assignment
DCOPClient(const DCOPClient &);
DCOPClient &operator=(const DCOPClient &);
+#endif
}; // class DCOPClient =========================================================
diff --git a/WebCore/kwq/KWQKStandardDirs.h b/WebCore/kwq/KWQKStandardDirs.h
index f11c8af..ec0d9fa 100644
--- a/WebCore/kwq/KWQKStandardDirs.h
+++ b/WebCore/kwq/KWQKStandardDirs.h
@@ -30,7 +30,8 @@
#include "kglobal.h"
-QString locate(const char *type, const QString& filename, const KInstance* instance = KGlobal::instance());
+QString locate(const char *type, const QString& filename,
+ const KInstance* instance=KGlobal::instance());
// class KStandardDirs =========================================================
@@ -46,8 +47,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KStandardDirs();
-
- ~KStandardDirs();
+ virtual ~KStandardDirs();
// member functions --------------------------------------------------------
@@ -61,6 +61,7 @@ public:
private:
// no copying or assignment
+ // note that these are "standard" (no pendantic stuff needed)
KStandardDirs(const KStandardDirs &);
KStandardDirs &operator=(const KStandardDirs &);
diff --git a/WebCore/kwq/KWQKStaticDeleter.h b/WebCore/kwq/KWQKStaticDeleter.h
index 8d715de..a8b1fc8 100644
--- a/WebCore/kwq/KWQKStaticDeleter.h
+++ b/WebCore/kwq/KWQKStaticDeleter.h
@@ -39,9 +39,12 @@ public:
// constructors, copy constructors, and destructors ------------------------
- KStaticDeleter();
+ KStaticDeleter() {}
- ~KStaticDeleter();
+// add no-op destructor
+#ifdef KWQ_PEDANTIC
+ ~KStaticDeleter() {}
+#endif
// member functions --------------------------------------------------------
diff --git a/WebCore/kwq/KWQKStringHandler.h b/WebCore/kwq/KWQKStringHandler.h
index 1ce6ffa..9d6a99b 100644
--- a/WebCore/kwq/KWQKStringHandler.h
+++ b/WebCore/kwq/KWQKStringHandler.h
@@ -44,9 +44,15 @@ public:
// constructors, copy constructors, and destructors ------------------------
- KStringHandler();
-
- ~KStringHandler();
+// add no-op constructor
+#ifdef KWQ_PEDANTIC
+ KStringHandler() {}
+#endif
+
+// add no-op destructor
+#ifdef KWQ_PEDANTIC
+ ~KStringHandler() {}
+#endif
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -55,9 +61,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef KWQ_PEDANTIC
KStringHandler(const KStringHandler &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef KWQ_PEDANTIC
KStringHandler &operator=(const KStringHandler &);
+#endif
}; // class KStringHandler =====================================================
diff --git a/WebCore/kwq/KWQKWin.h b/WebCore/kwq/KWQKWin.h
index 02eb9ef..e75911b 100644
--- a/WebCore/kwq/KWQKWin.h
+++ b/WebCore/kwq/KWQKWin.h
@@ -52,6 +52,17 @@ public:
static Info info(int win);
// constructors, copy constructors, and destructors ------------------------
+
+// add no-op constructor
+#ifdef KWQ_PEDANTIC
+ KWin() {}
+#endif
+
+// add no-op destructor
+#ifdef KWQ_PEDANTIC
+ ~KWin() {}
+#endif
+
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -59,9 +70,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef KWQ_PEDANTIC
KWin(const KWin &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef KWQ_PEDANTIC
KWin &operator=(const KWin &);
+#endif
}; // class KWin ===============================================================
diff --git a/WebCore/kwq/KWQKWinModule.h b/WebCore/kwq/KWQKWinModule.h
index 16e6368..d86d503 100644
--- a/WebCore/kwq/KWQKWinModule.h
+++ b/WebCore/kwq/KWQKWinModule.h
@@ -44,6 +44,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KWinModule(QObject* parent=0);
+ ~KWinModule();
// member functions --------------------------------------------------------
@@ -56,9 +57,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef KWQ_PEDANTIC
KWinModule(const KWinModule &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef KWQ_PEDANTIC
KWinModule &operator=(const KWinModule &);
+#endif
}; // class KWinModule =========================================================
diff --git a/WebCore/kwq/dcop/dcopclient.h b/WebCore/kwq/dcop/dcopclient.h
index e8a7d24..470177e 100644
--- a/WebCore/kwq/dcop/dcopclient.h
+++ b/WebCore/kwq/dcop/dcopclient.h
@@ -43,7 +43,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
DCOPClient();
-
virtual ~DCOPClient();
// member functions --------------------------------------------------------
@@ -68,9 +67,13 @@ public:
// private ---------------------------------------------------------------------
private:
+
+// add copy constructor and assignment operator
+#ifdef KWQ_PEDANTIC
// no copying or assignment
DCOPClient(const DCOPClient &);
DCOPClient &operator=(const DCOPClient &);
+#endif
}; // class DCOPClient =========================================================
diff --git a/WebCore/kwq/kdecore/kstaticdeleter.h b/WebCore/kwq/kdecore/kstaticdeleter.h
index 8d715de..a8b1fc8 100644
--- a/WebCore/kwq/kdecore/kstaticdeleter.h
+++ b/WebCore/kwq/kdecore/kstaticdeleter.h
@@ -39,9 +39,12 @@ public:
// constructors, copy constructors, and destructors ------------------------
- KStaticDeleter();
+ KStaticDeleter() {}
- ~KStaticDeleter();
+// add no-op destructor
+#ifdef KWQ_PEDANTIC
+ ~KStaticDeleter() {}
+#endif
// member functions --------------------------------------------------------
diff --git a/WebCore/kwq/kdecore/kstddirs.h b/WebCore/kwq/kdecore/kstddirs.h
index f11c8af..ec0d9fa 100644
--- a/WebCore/kwq/kdecore/kstddirs.h
+++ b/WebCore/kwq/kdecore/kstddirs.h
@@ -30,7 +30,8 @@
#include "kglobal.h"
-QString locate(const char *type, const QString& filename, const KInstance* instance = KGlobal::instance());
+QString locate(const char *type, const QString& filename,
+ const KInstance* instance=KGlobal::instance());
// class KStandardDirs =========================================================
@@ -46,8 +47,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KStandardDirs();
-
- ~KStandardDirs();
+ virtual ~KStandardDirs();
// member functions --------------------------------------------------------
@@ -61,6 +61,7 @@ public:
private:
// no copying or assignment
+ // note that these are "standard" (no pendantic stuff needed)
KStandardDirs(const KStandardDirs &);
KStandardDirs &operator=(const KStandardDirs &);
diff --git a/WebCore/kwq/kdecore/kstringhandler.h b/WebCore/kwq/kdecore/kstringhandler.h
index 1ce6ffa..9d6a99b 100644
--- a/WebCore/kwq/kdecore/kstringhandler.h
+++ b/WebCore/kwq/kdecore/kstringhandler.h
@@ -44,9 +44,15 @@ public:
// constructors, copy constructors, and destructors ------------------------
- KStringHandler();
-
- ~KStringHandler();
+// add no-op constructor
+#ifdef KWQ_PEDANTIC
+ KStringHandler() {}
+#endif
+
+// add no-op destructor
+#ifdef KWQ_PEDANTIC
+ ~KStringHandler() {}
+#endif
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -55,9 +61,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef KWQ_PEDANTIC
KStringHandler(const KStringHandler &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef KWQ_PEDANTIC
KStringHandler &operator=(const KStringHandler &);
+#endif
}; // class KStringHandler =====================================================
diff --git a/WebCore/kwq/kdecore/kwin.h b/WebCore/kwq/kdecore/kwin.h
index 02eb9ef..e75911b 100644
--- a/WebCore/kwq/kdecore/kwin.h
+++ b/WebCore/kwq/kdecore/kwin.h
@@ -52,6 +52,17 @@ public:
static Info info(int win);
// constructors, copy constructors, and destructors ------------------------
+
+// add no-op constructor
+#ifdef KWQ_PEDANTIC
+ KWin() {}
+#endif
+
+// add no-op destructor
+#ifdef KWQ_PEDANTIC
+ ~KWin() {}
+#endif
+
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -59,9 +70,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef KWQ_PEDANTIC
KWin(const KWin &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef KWQ_PEDANTIC
KWin &operator=(const KWin &);
+#endif
}; // class KWin ===============================================================
diff --git a/WebCore/kwq/kdecore/kwinmodule.h b/WebCore/kwq/kdecore/kwinmodule.h
index 16e6368..d86d503 100644
--- a/WebCore/kwq/kdecore/kwinmodule.h
+++ b/WebCore/kwq/kdecore/kwinmodule.h
@@ -44,6 +44,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KWinModule(QObject* parent=0);
+ ~KWinModule();
// member functions --------------------------------------------------------
@@ -56,9 +57,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef KWQ_PEDANTIC
KWinModule(const KWinModule &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef KWQ_PEDANTIC
KWinModule &operator=(const KWinModule &);
+#endif
}; // class KWinModule =========================================================
diff --git a/WebCore/src/kdelibs/khtml/css/Makefile.in.apple b/WebCore/src/kdelibs/khtml/css/Makefile.in.apple
index b31bd9a..6d7b75b 100644
--- a/WebCore/src/kdelibs/khtml/css/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/css/Makefile.in.apple
@@ -65,6 +65,8 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I. \
$(NULL)
+DEPFLAGS = $(CXXFLAGS)
+
#----------------------------------------------------------------------
# Set targets for this directory
@@ -80,16 +82,6 @@ $(VALUEFILES):
$(PROPFILES):
sh ./makeprop
-depend: Makefile.dep
-
-Makefile.dep: $(SOURCES) $(HEADERS)
- $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
-
-#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple b/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
index e75f26a..fa6e5c6 100644
--- a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
@@ -50,6 +50,8 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I. \
$(NULL)
+DEPFLAGS = $(CXXFLAGS)
+
#----------------------------------------------------------------------
# Set targets for this directory
@@ -59,16 +61,6 @@ $(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend: Makefile.dep
-
-Makefile.dep: $(SOURCES) $(HEADERS)
- $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
-
-#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
#----------------------------------------------------------------------
# include make rules boilerplate
diff --git a/WebCore/src/kdelibs/khtml/ecma/Makefile.in.apple b/WebCore/src/kdelibs/khtml/ecma/Makefile.in.apple
index 7f39701..4324305 100644
--- a/WebCore/src/kdelibs/khtml/ecma/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/ecma/Makefile.in.apple
@@ -50,6 +50,8 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I. \
$(NULL)
+DEPFLAGS = $(CXXFLAGS)
+
#----------------------------------------------------------------------
# Set targets for this directory
@@ -62,21 +64,11 @@ $(LIBRARY): $(CXXOBJECTS)
$(PROGRAM): testecma.o
$(CC) -o $@ $< -L. -lkhtmlecma
-depend: Makefile.dep
-
-Makefile.dep: $(SOURCES) $(HEADERS)
- $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
-
kjs_window.cpp: kjs_window.moc
kjs_window.moc:
touch $@
#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
-#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/src/kdelibs/khtml/html/Makefile.in.apple b/WebCore/src/kdelibs/khtml/html/Makefile.in.apple
index 4eff431..4880c11 100644
--- a/WebCore/src/kdelibs/khtml/html/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/html/Makefile.in.apple
@@ -51,20 +51,17 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I$(TOPSRCDIR) \
$(NULL)
+DEPFLAGS = $(CXXFLAGS)
+
#----------------------------------------------------------------------
# Set targets for this directory
-all: Makefile.dep $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend: Makefile.dep
-
-Makefile.dep: $(SOURCES) $(HEADERS)
- $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
-
htmltokenizer.cpp: htmltokenizer.moc
htmltokenizer.moc:
touch $@
@@ -74,11 +71,6 @@ html_documentimpl.moc:
touch $@
#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
-#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/src/kdelibs/khtml/java/Makefile.in.apple b/WebCore/src/kdelibs/khtml/java/Makefile.in.apple
index 8f27571..8e96b68 100644
--- a/WebCore/src/kdelibs/khtml/java/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/java/Makefile.in.apple
@@ -43,6 +43,8 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I. \
$(NULL)
+DEPFLAGS = $(CXXFLAGS)
+
#----------------------------------------------------------------------
# Set targets for this directory
@@ -52,11 +54,6 @@ $(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend: Makefile.dep
-
-Makefile.dep: $(SOURCES) $(HEADERS)
- $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
-
kjavaapplet.cpp: kjavaapplet.moc
kjavaapplet.moc:
touch $@
@@ -82,11 +79,6 @@ kjavaprocess.moc:
touch $@
#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
-#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple b/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
index 9e03dc0..2d33b07 100644
--- a/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
@@ -63,6 +63,8 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I. \
$(NULL)
+DEPFLAGS = $(CXXFLAGS)
+
#----------------------------------------------------------------------
# Set targets for this directory
@@ -72,11 +74,6 @@ $(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend: Makefile.dep
-
-Makefile.dep: $(SOURCES) $(HEADERS)
- $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
-
loader.cpp: loader.moc
loader.moc:
touch loader.moc
@@ -91,11 +88,6 @@ $(ATTRSFILES):
./makeattrs
#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
-#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/src/kdelibs/khtml/rendering/Makefile.in.apple b/WebCore/src/kdelibs/khtml/rendering/Makefile.in.apple
index 15eba4c..7b190b7 100644
--- a/WebCore/src/kdelibs/khtml/rendering/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/rendering/Makefile.in.apple
@@ -54,6 +54,8 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I$(TOPSRCDIR) \
$(NULL)
+DEPFLAGS = $(CXXFLAGS)
+
#----------------------------------------------------------------------
# Set targets for this directory
@@ -63,11 +65,6 @@ $(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-depend: Makefile.dep
-
-Makefile.dep: $(SOURCES) $(HEADERS)
- $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
-
render_form.cpp: render_form.moc
render_form.moc:
touch $@
@@ -81,11 +78,6 @@ render_replaced.moc:
touch $@
#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
-#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple b/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
index 750bc5c..e57416f 100644
--- a/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
@@ -61,16 +61,13 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I. \
$(NULL)
+DEPFLAGS = $(CXXFLAGS)
+
#----------------------------------------------------------------------
# Set targets for this directory
all: $(OBJECTS) $(LIBRARY)
-depend: Makefile.dep
-
-Makefile.dep: $(SOURCES) $(HEADERS)
- $(CC) -MM $(CXXFLAGS) $(SOURCES) > Makefile.dep
-
dom_docimpl.cpp: dom_docimpl.moc
dom_docimpl.moc:
touch $@
@@ -83,11 +80,6 @@ $(LIBRARY): $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
#----------------------------------------------------------------------
-# include make dependency rules
-
--include Makefile.dep
-
-#----------------------------------------------------------------------
# include make rules boilerplate
include $(TOPSRCDIR)/Makefile.rules
diff --git a/WebCore/src/kwq/dcop/dcopclient.h b/WebCore/src/kwq/dcop/dcopclient.h
index e8a7d24..470177e 100644
--- a/WebCore/src/kwq/dcop/dcopclient.h
+++ b/WebCore/src/kwq/dcop/dcopclient.h
@@ -43,7 +43,6 @@ public:
// constructors, copy constructors, and destructors ------------------------
DCOPClient();
-
virtual ~DCOPClient();
// member functions --------------------------------------------------------
@@ -68,9 +67,13 @@ public:
// private ---------------------------------------------------------------------
private:
+
+// add copy constructor and assignment operator
+#ifdef KWQ_PEDANTIC
// no copying or assignment
DCOPClient(const DCOPClient &);
DCOPClient &operator=(const DCOPClient &);
+#endif
}; // class DCOPClient =========================================================
diff --git a/WebCore/src/kwq/kdecore/kstaticdeleter.h b/WebCore/src/kwq/kdecore/kstaticdeleter.h
index 8d715de..a8b1fc8 100644
--- a/WebCore/src/kwq/kdecore/kstaticdeleter.h
+++ b/WebCore/src/kwq/kdecore/kstaticdeleter.h
@@ -39,9 +39,12 @@ public:
// constructors, copy constructors, and destructors ------------------------
- KStaticDeleter();
+ KStaticDeleter() {}
- ~KStaticDeleter();
+// add no-op destructor
+#ifdef KWQ_PEDANTIC
+ ~KStaticDeleter() {}
+#endif
// member functions --------------------------------------------------------
diff --git a/WebCore/src/kwq/kdecore/kstddirs.h b/WebCore/src/kwq/kdecore/kstddirs.h
index f11c8af..ec0d9fa 100644
--- a/WebCore/src/kwq/kdecore/kstddirs.h
+++ b/WebCore/src/kwq/kdecore/kstddirs.h
@@ -30,7 +30,8 @@
#include "kglobal.h"
-QString locate(const char *type, const QString& filename, const KInstance* instance = KGlobal::instance());
+QString locate(const char *type, const QString& filename,
+ const KInstance* instance=KGlobal::instance());
// class KStandardDirs =========================================================
@@ -46,8 +47,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KStandardDirs();
-
- ~KStandardDirs();
+ virtual ~KStandardDirs();
// member functions --------------------------------------------------------
@@ -61,6 +61,7 @@ public:
private:
// no copying or assignment
+ // note that these are "standard" (no pendantic stuff needed)
KStandardDirs(const KStandardDirs &);
KStandardDirs &operator=(const KStandardDirs &);
diff --git a/WebCore/src/kwq/kdecore/kstringhandler.h b/WebCore/src/kwq/kdecore/kstringhandler.h
index 1ce6ffa..9d6a99b 100644
--- a/WebCore/src/kwq/kdecore/kstringhandler.h
+++ b/WebCore/src/kwq/kdecore/kstringhandler.h
@@ -44,9 +44,15 @@ public:
// constructors, copy constructors, and destructors ------------------------
- KStringHandler();
-
- ~KStringHandler();
+// add no-op constructor
+#ifdef KWQ_PEDANTIC
+ KStringHandler() {}
+#endif
+
+// add no-op destructor
+#ifdef KWQ_PEDANTIC
+ ~KStringHandler() {}
+#endif
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -55,9 +61,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef KWQ_PEDANTIC
KStringHandler(const KStringHandler &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef KWQ_PEDANTIC
KStringHandler &operator=(const KStringHandler &);
+#endif
}; // class KStringHandler =====================================================
diff --git a/WebCore/src/kwq/kdecore/kwin.h b/WebCore/src/kwq/kdecore/kwin.h
index 02eb9ef..e75911b 100644
--- a/WebCore/src/kwq/kdecore/kwin.h
+++ b/WebCore/src/kwq/kdecore/kwin.h
@@ -52,6 +52,17 @@ public:
static Info info(int win);
// constructors, copy constructors, and destructors ------------------------
+
+// add no-op constructor
+#ifdef KWQ_PEDANTIC
+ KWin() {}
+#endif
+
+// add no-op destructor
+#ifdef KWQ_PEDANTIC
+ ~KWin() {}
+#endif
+
// member functions --------------------------------------------------------
// operators ---------------------------------------------------------------
@@ -59,9 +70,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef KWQ_PEDANTIC
KWin(const KWin &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef KWQ_PEDANTIC
KWin &operator=(const KWin &);
+#endif
}; // class KWin ===============================================================
diff --git a/WebCore/src/kwq/kdecore/kwinmodule.h b/WebCore/src/kwq/kdecore/kwinmodule.h
index 16e6368..d86d503 100644
--- a/WebCore/src/kwq/kdecore/kwinmodule.h
+++ b/WebCore/src/kwq/kdecore/kwinmodule.h
@@ -44,6 +44,7 @@ public:
// constructors, copy constructors, and destructors ------------------------
KWinModule(QObject* parent=0);
+ ~KWinModule();
// member functions --------------------------------------------------------
@@ -56,9 +57,18 @@ public:
// private ---------------------------------------------------------------------
private:
- // no copying or assignment
+
+// add copy constructor
+// this private declaration prevents copying
+#ifdef KWQ_PEDANTIC
KWinModule(const KWinModule &);
+#endif
+
+// add assignment operator
+// this private declaration prevents assignment
+#ifdef KWQ_PEDANTIC
KWinModule &operator=(const KWinModule &);
+#endif
}; // class KWinModule =========================================================
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list