[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:54:18 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit e258cad6760a2e0d7ab2641f89c4ba07e8bb83d9
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 18 05:28:36 2002 +0000
Fix a couple of problems that kept `make -j3' from working from a
clean start (use stamp files to serialize build a bit more where
needed)
* src/Makefile.am:
* src/kdelibs/khtml/css/Makefile.am:
* src/kdelibs/khtml/misc/Makefile.am:
* src/kdelibs/kjs/Makefile.am:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@546 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/kjs/Makefile.am b/JavaScriptCore/kjs/Makefile.am
index 5c3d3c2..5db974e 100644
--- a/JavaScriptCore/kjs/Makefile.am
+++ b/JavaScriptCore/kjs/Makefile.am
@@ -58,20 +58,24 @@ libkjs_o_SOURCES = \
ustring.h \
$(NULL)
-BUILT_SOURCES = grammar.cpp grammar.cpp.h grammar.h
-
noinst_PROGRAMS = testkjs
testkjs_SOURCES = testkjs.cpp
testkjs_LDADD = $(srcdir)/libkjs.o
-CLEANFILES = $(BUILT_SOURCES) \
- $(NULL)
-
YACCFLAGS = -d --output-file=grammar.cpp --file-prefix=grammar --name-prefix=kjsyy
-grammar.h grammar.cpp.h grammar.cpp: grammar.y
+GRAMMAR_FILES = grammar.h grammar.cpp.h grammar.cpp
+
+$(GRAMMAR_FILES): grammar-stamp
+
+grammar-stamp: grammar.y
$(YACC) $(YACCFLAGS) $<
ln -sf grammar.cpp.h grammar.h
+ touch ./grammar-stamp
+
+BUILT_SOURCES = $(GRAMMAR_FILES) grammar-stamp
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 04c348e..f89b751 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
2002-01-17 Maciej Stachowiak <mjs at apple.com>
+ Fix a couple of problems that kept `make -j3' from working from a
+ clean start (use stamp files to serialize build a bit more where
+ needed)
+
+ * src/Makefile.am:
+ * src/kdelibs/khtml/css/Makefile.am:
+ * src/kdelibs/khtml/misc/Makefile.am:
+ * src/kdelibs/kjs/Makefile.am:
+
+2002-01-17 Maciej Stachowiak <mjs at apple.com>
+
* src/kwq/Makefile.am: Fix another bonehead mistake.
2002-01-17 Maciej Stachowiak <mjs at apple.com>
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 04c348e..f89b751 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
2002-01-17 Maciej Stachowiak <mjs at apple.com>
+ Fix a couple of problems that kept `make -j3' from working from a
+ clean start (use stamp files to serialize build a bit more where
+ needed)
+
+ * src/Makefile.am:
+ * src/kdelibs/khtml/css/Makefile.am:
+ * src/kdelibs/khtml/misc/Makefile.am:
+ * src/kdelibs/kjs/Makefile.am:
+
+2002-01-17 Maciej Stachowiak <mjs at apple.com>
+
* src/kwq/Makefile.am: Fix another bonehead mistake.
2002-01-17 Maciej Stachowiak <mjs at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 04c348e..f89b751 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
2002-01-17 Maciej Stachowiak <mjs at apple.com>
+ Fix a couple of problems that kept `make -j3' from working from a
+ clean start (use stamp files to serialize build a bit more where
+ needed)
+
+ * src/Makefile.am:
+ * src/kdelibs/khtml/css/Makefile.am:
+ * src/kdelibs/khtml/misc/Makefile.am:
+ * src/kdelibs/kjs/Makefile.am:
+
+2002-01-17 Maciej Stachowiak <mjs at apple.com>
+
* src/kwq/Makefile.am: Fix another bonehead mistake.
2002-01-17 Maciej Stachowiak <mjs at apple.com>
diff --git a/WebCore/khtml/css/Makefile.am b/WebCore/khtml/css/Makefile.am
index 90e28bc..b40668f 100644
--- a/WebCore/khtml/css/Makefile.am
+++ b/WebCore/khtml/css/Makefile.am
@@ -38,19 +38,23 @@ PROPFILES = \
cssproperties.gperf \
$(NULL)
-
-BUILT_SOURCES = $(VALUEFILES) $(PROPFILES)
-
-CLEANFILES = $(BUILT_SOURCES)
-
INCLUDES = \
$(KWQ_INCLUDES) \
$(KDELIBS_INCLUDES) \
$(NULL)
-$(VALUEFILES):
+$(VALUEFILES): value-stamp
+
+value-stamp: makevalues
sh ./makevalues
+ touch ./value-stamp
+
+$(PROPFILES): prop-stamp
-$(PROPFILES):
+prop-stamp: makeprop
sh ./makeprop
+ touch ./prop-stamp
+BUILT_SOURCES = $(VALUEFILES) $(PROPFILES) value-stamp prop-stamp
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/khtml/misc/Makefile.am b/WebCore/khtml/misc/Makefile.am
index af9eb9e..c1b0a5a 100644
--- a/WebCore/khtml/misc/Makefile.am
+++ b/WebCore/khtml/misc/Makefile.am
@@ -49,12 +49,18 @@ ATTRSFILES = \
khtmldata.h:
touch $@
-$(TAGFILES):
+$(TAGFILES): tag-stamp
+
+tag-stamp: maketags
perl ./maketags
+ touch ./tag-stamp
+
+$(ATTRSFILES): attr-stamp
-$(ATTRSFILES):
+attr-stamp: makeattrs
perl ./makeattrs
+ touch ./attr-stamp
-BUILT_SOURCES = khtmldata.h $(TAGFILES) $(ATTRSFILES)
+BUILT_SOURCES = khtmldata.h $(TAGFILES) $(ATTRSFILES) tag-stamp attr-stamp
CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/src/Makefile.am b/WebCore/src/Makefile.am
index f95802d..5423ff7 100644
--- a/WebCore/src/Makefile.am
+++ b/WebCore/src/Makefile.am
@@ -31,4 +31,9 @@ LDFLAGS = \
libwebcore_dylib_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o
-all: install-am
+noinst_DATA = webcore-install-stamp
+
+webcore-install-stamp: libwebcore.dylib
+ $(MAKE) install-symrootsLIBRARIES
+ touch ./webcore-install-stamp
+
diff --git a/WebCore/src/kdelibs/khtml/css/Makefile.am b/WebCore/src/kdelibs/khtml/css/Makefile.am
index 90e28bc..b40668f 100644
--- a/WebCore/src/kdelibs/khtml/css/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/css/Makefile.am
@@ -38,19 +38,23 @@ PROPFILES = \
cssproperties.gperf \
$(NULL)
-
-BUILT_SOURCES = $(VALUEFILES) $(PROPFILES)
-
-CLEANFILES = $(BUILT_SOURCES)
-
INCLUDES = \
$(KWQ_INCLUDES) \
$(KDELIBS_INCLUDES) \
$(NULL)
-$(VALUEFILES):
+$(VALUEFILES): value-stamp
+
+value-stamp: makevalues
sh ./makevalues
+ touch ./value-stamp
+
+$(PROPFILES): prop-stamp
-$(PROPFILES):
+prop-stamp: makeprop
sh ./makeprop
+ touch ./prop-stamp
+BUILT_SOURCES = $(VALUEFILES) $(PROPFILES) value-stamp prop-stamp
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/src/kdelibs/khtml/misc/Makefile.am b/WebCore/src/kdelibs/khtml/misc/Makefile.am
index af9eb9e..c1b0a5a 100644
--- a/WebCore/src/kdelibs/khtml/misc/Makefile.am
+++ b/WebCore/src/kdelibs/khtml/misc/Makefile.am
@@ -49,12 +49,18 @@ ATTRSFILES = \
khtmldata.h:
touch $@
-$(TAGFILES):
+$(TAGFILES): tag-stamp
+
+tag-stamp: maketags
perl ./maketags
+ touch ./tag-stamp
+
+$(ATTRSFILES): attr-stamp
-$(ATTRSFILES):
+attr-stamp: makeattrs
perl ./makeattrs
+ touch ./attr-stamp
-BUILT_SOURCES = khtmldata.h $(TAGFILES) $(ATTRSFILES)
+BUILT_SOURCES = khtmldata.h $(TAGFILES) $(ATTRSFILES) tag-stamp attr-stamp
CLEANFILES = $(BUILT_SOURCES)
diff --git a/WebCore/src/kdelibs/kjs/Makefile.am b/WebCore/src/kdelibs/kjs/Makefile.am
index 5c3d3c2..5db974e 100644
--- a/WebCore/src/kdelibs/kjs/Makefile.am
+++ b/WebCore/src/kdelibs/kjs/Makefile.am
@@ -58,20 +58,24 @@ libkjs_o_SOURCES = \
ustring.h \
$(NULL)
-BUILT_SOURCES = grammar.cpp grammar.cpp.h grammar.h
-
noinst_PROGRAMS = testkjs
testkjs_SOURCES = testkjs.cpp
testkjs_LDADD = $(srcdir)/libkjs.o
-CLEANFILES = $(BUILT_SOURCES) \
- $(NULL)
-
YACCFLAGS = -d --output-file=grammar.cpp --file-prefix=grammar --name-prefix=kjsyy
-grammar.h grammar.cpp.h grammar.cpp: grammar.y
+GRAMMAR_FILES = grammar.h grammar.cpp.h grammar.cpp
+
+$(GRAMMAR_FILES): grammar-stamp
+
+grammar-stamp: grammar.y
$(YACC) $(YACCFLAGS) $<
ln -sf grammar.cpp.h grammar.h
+ touch ./grammar-stamp
+
+BUILT_SOURCES = $(GRAMMAR_FILES) grammar-stamp
+
+CLEANFILES = $(BUILT_SOURCES)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list