[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:24 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 836d7b950d4c27418448f152c75a844057b02c6d
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 6 14:03:43 2001 +0000
Some small tweaks to the make system to prevent spurious remaking of Makefile.dep
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@112 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/kjs/Makefile.in b/JavaScriptCore/kjs/Makefile.in
index f3b63e1..ca8efde 100644
--- a/JavaScriptCore/kjs/Makefile.in
+++ b/JavaScriptCore/kjs/Makefile.in
@@ -103,6 +103,8 @@ $(LIBRARY): $(CXXOBJECTS)
$(PROGRAM): testkjs.o
$(CC) $< -o $@ -L. -lkjs
+depend:
+
grammar.h: grammar.cpp.h
ln -s grammar.cpp.h grammar.h
diff --git a/JavaScriptCore/kjs/Makefile.in.apple b/JavaScriptCore/kjs/Makefile.in.apple
index f3b63e1..ca8efde 100644
--- a/JavaScriptCore/kjs/Makefile.in.apple
+++ b/JavaScriptCore/kjs/Makefile.in.apple
@@ -103,6 +103,8 @@ $(LIBRARY): $(CXXOBJECTS)
$(PROGRAM): testkjs.o
$(CC) $< -o $@ -L. -lkjs
+depend:
+
grammar.h: grammar.cpp.h
ln -s grammar.cpp.h grammar.h
diff --git a/WebCore/Makefile.in b/WebCore/Makefile.in
index c50c4f1..31d280b 100644
--- a/WebCore/Makefile.in
+++ b/WebCore/Makefile.in
@@ -32,7 +32,7 @@ SUBDIRS = \
#----------------------------------------------------------------------
# Standard targets
-all setup install clean distclean maintainer-clean:
+all depend setup install clean distclean maintainer-clean:
@target=$@; \
list='$(SUBDIRS)'; \
for subdir in $$list; do \
@@ -55,6 +55,7 @@ local-all:
local-dep:
local-install:
local-setup:
+local-depend:
local-clean:
local-distclean:
diff --git a/WebCore/khtml/css/Makefile.in.apple b/WebCore/khtml/css/Makefile.in.apple
index 771031f..b31bd9a 100644
--- a/WebCore/khtml/css/Makefile.in.apple
+++ b/WebCore/khtml/css/Makefile.in.apple
@@ -68,7 +68,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: Makefile.dep $(CFILES) $(OBJECTS) $(LIBRARY)
+all: $(CFILES) $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/dom/Makefile.in.apple b/WebCore/khtml/dom/Makefile.in.apple
index 1ef72ac..e75f26a 100644
--- a/WebCore/khtml/dom/Makefile.in.apple
+++ b/WebCore/khtml/dom/Makefile.in.apple
@@ -53,7 +53,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: Makefile.dep $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/ecma/Makefile.in.apple b/WebCore/khtml/ecma/Makefile.in.apple
index f5463f5..7f39701 100644
--- a/WebCore/khtml/ecma/Makefile.in.apple
+++ b/WebCore/khtml/ecma/Makefile.in.apple
@@ -53,7 +53,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: Makefile.dep $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/java/Makefile.in.apple b/WebCore/khtml/java/Makefile.in.apple
index aa9475d..8f27571 100644
--- a/WebCore/khtml/java/Makefile.in.apple
+++ b/WebCore/khtml/java/Makefile.in.apple
@@ -1,4 +1,3 @@
-# Generated automatically from Makefile.in by configure.
#======================================================================
#
# Makefile
@@ -47,7 +46,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: Makefile.dep $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/misc/Makefile.in.apple b/WebCore/khtml/misc/Makefile.in.apple
index 76f3d6e..f0077eb 100644
--- a/WebCore/khtml/misc/Makefile.in.apple
+++ b/WebCore/khtml/misc/Makefile.in.apple
@@ -66,7 +66,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: Makefile.dep $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/rendering/Makefile.in.apple b/WebCore/khtml/rendering/Makefile.in.apple
index a660a74..15eba4c 100644
--- a/WebCore/khtml/rendering/Makefile.in.apple
+++ b/WebCore/khtml/rendering/Makefile.in.apple
@@ -57,7 +57,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: Makefile.dep $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/xml/Makefile.in.apple b/WebCore/khtml/xml/Makefile.in.apple
index 8be561b..750bc5c 100644
--- a/WebCore/khtml/xml/Makefile.in.apple
+++ b/WebCore/khtml/xml/Makefile.in.apple
@@ -1,4 +1,3 @@
-# Generated automatically from Makefile.in by configure.
#======================================================================
#
# Makefile
diff --git a/WebCore/kwq/kdecore/kcompletion.h b/WebCore/kwq/kdecore/kcompletion.h
deleted file mode 100644
index 382975e..0000000
--- a/WebCore/kwq/kdecore/kcompletion.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef KCOMPLETION_H_
-#define KCOMPLETION_H_
-
-#include <qobject.h>
-#include <qstringlist.h>
-
-class KCompletion : public QObject {
-public:
- KCompletion();
- void setItems(const QStringList&);
-};
-
-class KCompletionBase {
-public:
- KCompletionBase();
- KCompletion *completionObject(bool hsig = true);
-};
-
-#endif
diff --git a/WebCore/src/kdelibs/khtml/css/Makefile.in.apple b/WebCore/src/kdelibs/khtml/css/Makefile.in.apple
index 771031f..b31bd9a 100644
--- a/WebCore/src/kdelibs/khtml/css/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/css/Makefile.in.apple
@@ -68,7 +68,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: Makefile.dep $(CFILES) $(OBJECTS) $(LIBRARY)
+all: $(CFILES) $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple b/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
index 1ef72ac..e75f26a 100644
--- a/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/dom/Makefile.in.apple
@@ -53,7 +53,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: Makefile.dep $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/ecma/Makefile.in.apple b/WebCore/src/kdelibs/khtml/ecma/Makefile.in.apple
index f5463f5..7f39701 100644
--- a/WebCore/src/kdelibs/khtml/ecma/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/ecma/Makefile.in.apple
@@ -53,7 +53,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: Makefile.dep $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/java/Makefile.in.apple b/WebCore/src/kdelibs/khtml/java/Makefile.in.apple
index aa9475d..8f27571 100644
--- a/WebCore/src/kdelibs/khtml/java/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/java/Makefile.in.apple
@@ -1,4 +1,3 @@
-# Generated automatically from Makefile.in by configure.
#======================================================================
#
# Makefile
@@ -47,7 +46,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: Makefile.dep $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple b/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
index 76f3d6e..f0077eb 100644
--- a/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/misc/Makefile.in.apple
@@ -66,7 +66,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: Makefile.dep $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/rendering/Makefile.in.apple b/WebCore/src/kdelibs/khtml/rendering/Makefile.in.apple
index a660a74..15eba4c 100644
--- a/WebCore/src/kdelibs/khtml/rendering/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/rendering/Makefile.in.apple
@@ -57,7 +57,7 @@ CXXFLAGS = $(BASECXXFLAGS) \
#----------------------------------------------------------------------
# Set targets for this directory
-all: Makefile.dep $(OBJECTS) $(LIBRARY)
+all: $(OBJECTS) $(LIBRARY)
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple b/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
index 8be561b..750bc5c 100644
--- a/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
+++ b/WebCore/src/kdelibs/khtml/xml/Makefile.in.apple
@@ -1,4 +1,3 @@
-# Generated automatically from Makefile.in by configure.
#======================================================================
#
# Makefile
diff --git a/WebCore/src/kdelibs/kjs/Makefile.in b/WebCore/src/kdelibs/kjs/Makefile.in
index f3b63e1..ca8efde 100644
--- a/WebCore/src/kdelibs/kjs/Makefile.in
+++ b/WebCore/src/kdelibs/kjs/Makefile.in
@@ -103,6 +103,8 @@ $(LIBRARY): $(CXXOBJECTS)
$(PROGRAM): testkjs.o
$(CC) $< -o $@ -L. -lkjs
+depend:
+
grammar.h: grammar.cpp.h
ln -s grammar.cpp.h grammar.h
diff --git a/WebCore/src/kdelibs/kjs/Makefile.in.apple b/WebCore/src/kdelibs/kjs/Makefile.in.apple
index f3b63e1..ca8efde 100644
--- a/WebCore/src/kdelibs/kjs/Makefile.in.apple
+++ b/WebCore/src/kdelibs/kjs/Makefile.in.apple
@@ -103,6 +103,8 @@ $(LIBRARY): $(CXXOBJECTS)
$(PROGRAM): testkjs.o
$(CC) $< -o $@ -L. -lkjs
+depend:
+
grammar.h: grammar.cpp.h
ln -s grammar.cpp.h grammar.h
diff --git a/WebCore/src/kwq/kdecore/kcompletion.h b/WebCore/src/kwq/kdecore/kcompletion.h
deleted file mode 100644
index 382975e..0000000
--- a/WebCore/src/kwq/kdecore/kcompletion.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef KCOMPLETION_H_
-#define KCOMPLETION_H_
-
-#include <qobject.h>
-#include <qstringlist.h>
-
-class KCompletion : public QObject {
-public:
- KCompletion();
- void setItems(const QStringList&);
-};
-
-class KCompletionBase {
-public:
- KCompletionBase();
- KCompletion *completionObject(bool hsig = true);
-};
-
-#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list