[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:52:29 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 6cc29119c2c5c40c256658e3913a5df95146f927
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 16 16:20:10 2001 +0000
Changes to the make system to support building via make with the -j option
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@461 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/kjs/Makefile.in b/JavaScriptCore/kjs/Makefile.in
index b4aac99..99ea2e9 100644
--- a/JavaScriptCore/kjs/Makefile.in
+++ b/JavaScriptCore/kjs/Makefile.in
@@ -71,7 +71,7 @@ CXXOBJECTS = \
ustring.o \
$(NULL)
-PROGRAM = testkjs
+PROGRAMS = testkjs
EXPORT_HEADERS = $(HEADERS)
@@ -81,6 +81,8 @@ EXPORT_OBJECTS = $(CXXOBJECTS)
EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+GENERATE_OBJECTS = $(CXXYACCOBJECTS)
+
LIBRARY = libkjs.a
CLEAN_FILES = $(OBJECTS) \
@@ -89,7 +91,7 @@ CLEAN_FILES = $(OBJECTS) \
grammar.cpp.h \
testkjs.o \
$(LIBRARY) \
- $(PROGRAM) \
+ $(PROGRAMS) \
$(NULL)
#----------------------------------------------------------------------
@@ -100,13 +102,13 @@ YACCFLAGS = -d --output-file=grammar.cpp --name-prefix=kjsyy
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(CXXYACCOBJECTS) $(OBJECTS) $(LIBRARY) $(PROGRAM) export-headers export-objects
+all: generate-objects $(OBJECTS) $(LIBRARY) export-headers export-objects
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-$(PROGRAM): testkjs.o
+$(PROGRAMS): testkjs.o
$(CC) $< -o $@ -L. -lkjs
depend:
diff --git a/WebCore/khtml/css/Makefile.in b/WebCore/khtml/css/Makefile.in
index 236ced0..8487ec7 100644
--- a/WebCore/khtml/css/Makefile.in
+++ b/WebCore/khtml/css/Makefile.in
@@ -40,7 +40,7 @@ PROPFILES = \
cssproperties.gperf \
$(NULL)
-CFILES = $(VALUEFILES) $(PROPFILES)
+GENERATE_OBJECTS = $(VALUEFILES) $(PROPFILES)
EXPORT_HEADERS = $(HEADERS)
@@ -54,7 +54,7 @@ LIBRARY = libkhtmlcss.a
CLEAN_FILES = $(OBJECTS) \
$(LIBRARY) \
- $(CFILES) \
+ $(GENERATE_OBJECTS) \
$(NULL)
#----------------------------------------------------------------------
@@ -85,7 +85,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(CFILES) $(OBJECTS) export-headers export-objects
+all: generate-objects $(OBJECTS) export-headers export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/khtml/ecma/Makefile.in b/WebCore/khtml/ecma/Makefile.in
index 21974c0..78639d6 100644
--- a/WebCore/khtml/ecma/Makefile.in
+++ b/WebCore/khtml/ecma/Makefile.in
@@ -29,7 +29,7 @@ EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
LIBRARY = libkhtmlecma.a
-PROGRAM = testecma
+PROGRAMS = testecma
CLEAN_FILES = $(OBJECTS) \
kjs_window.moc \
@@ -69,7 +69,7 @@ $(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-$(PROGRAM): testecma.o
+$(PROGRAMS): testecma.o
$(CC) -o $@ $< -L. -lkhtmlecma
kjs_window.cpp: kjs_window.moc
diff --git a/WebCore/khtml/misc/Makefile.in b/WebCore/khtml/misc/Makefile.in
index 04f1714..c1d82b8 100644
--- a/WebCore/khtml/misc/Makefile.in
+++ b/WebCore/khtml/misc/Makefile.in
@@ -34,11 +34,11 @@ ATTRSFILES = \
htmlattrs.gperf \
$(NULL)
-CFILES = $(TAGFILES) $(ATTRSFILES)
+GENERATE_OBJECTS = $(TAGFILES) $(ATTRSFILES)
EXPORT_HEADERS = $(HEADERS)
-OBJECTS = khtmldata.h $(CFILES) $(CXXOBJECTS)
+OBJECTS = khtmldata.h $(GENERATE_OBJECTS) $(CXXOBJECTS)
EXPORT_OBJECTS = $(CXXOBJECTS)
EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
@@ -48,7 +48,7 @@ LIBRARY = libkhtmlmisc.a
CLEAN_FILES = $(OBJECTS) \
$(LIBRARY) \
- $(CFILES) \
+ $(GENERATE_OBJECTS) \
$(NULL)
#----------------------------------------------------------------------
@@ -76,7 +76,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(CFILES) $(OBJECTS) export-headers export-objects
+all: generate-objects $(OBJECTS) export-headers export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/css/Makefile.in b/WebCore/src/kdelibs/khtml/css/Makefile.in
index 236ced0..8487ec7 100644
--- a/WebCore/src/kdelibs/khtml/css/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/css/Makefile.in
@@ -40,7 +40,7 @@ PROPFILES = \
cssproperties.gperf \
$(NULL)
-CFILES = $(VALUEFILES) $(PROPFILES)
+GENERATE_OBJECTS = $(VALUEFILES) $(PROPFILES)
EXPORT_HEADERS = $(HEADERS)
@@ -54,7 +54,7 @@ LIBRARY = libkhtmlcss.a
CLEAN_FILES = $(OBJECTS) \
$(LIBRARY) \
- $(CFILES) \
+ $(GENERATE_OBJECTS) \
$(NULL)
#----------------------------------------------------------------------
@@ -85,7 +85,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(CFILES) $(OBJECTS) export-headers export-objects
+all: generate-objects $(OBJECTS) export-headers export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/khtml/ecma/Makefile.in b/WebCore/src/kdelibs/khtml/ecma/Makefile.in
index 21974c0..78639d6 100644
--- a/WebCore/src/kdelibs/khtml/ecma/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/ecma/Makefile.in
@@ -29,7 +29,7 @@ EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
LIBRARY = libkhtmlecma.a
-PROGRAM = testecma
+PROGRAMS = testecma
CLEAN_FILES = $(OBJECTS) \
kjs_window.moc \
@@ -69,7 +69,7 @@ $(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-$(PROGRAM): testecma.o
+$(PROGRAMS): testecma.o
$(CC) -o $@ $< -L. -lkhtmlecma
kjs_window.cpp: kjs_window.moc
diff --git a/WebCore/src/kdelibs/khtml/misc/Makefile.in b/WebCore/src/kdelibs/khtml/misc/Makefile.in
index 04f1714..c1d82b8 100644
--- a/WebCore/src/kdelibs/khtml/misc/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/misc/Makefile.in
@@ -34,11 +34,11 @@ ATTRSFILES = \
htmlattrs.gperf \
$(NULL)
-CFILES = $(TAGFILES) $(ATTRSFILES)
+GENERATE_OBJECTS = $(TAGFILES) $(ATTRSFILES)
EXPORT_HEADERS = $(HEADERS)
-OBJECTS = khtmldata.h $(CFILES) $(CXXOBJECTS)
+OBJECTS = khtmldata.h $(GENERATE_OBJECTS) $(CXXOBJECTS)
EXPORT_OBJECTS = $(CXXOBJECTS)
EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
@@ -48,7 +48,7 @@ LIBRARY = libkhtmlmisc.a
CLEAN_FILES = $(OBJECTS) \
$(LIBRARY) \
- $(CFILES) \
+ $(GENERATE_OBJECTS) \
$(NULL)
#----------------------------------------------------------------------
@@ -76,7 +76,7 @@ DEPFLAGS = $(CXXFLAGS)
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(CFILES) $(OBJECTS) export-headers export-objects
+all: generate-objects $(OBJECTS) export-headers export-objects
$(LIBRARY): $(OBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
diff --git a/WebCore/src/kdelibs/kjs/Makefile.in b/WebCore/src/kdelibs/kjs/Makefile.in
index b4aac99..99ea2e9 100644
--- a/WebCore/src/kdelibs/kjs/Makefile.in
+++ b/WebCore/src/kdelibs/kjs/Makefile.in
@@ -71,7 +71,7 @@ CXXOBJECTS = \
ustring.o \
$(NULL)
-PROGRAM = testkjs
+PROGRAMS = testkjs
EXPORT_HEADERS = $(HEADERS)
@@ -81,6 +81,8 @@ EXPORT_OBJECTS = $(CXXOBJECTS)
EXPORT_HEADERS_DIR = $(TOPSRCDIR)/WebCore/include/private
EXPORT_OBJECTS_DIR = $(TOPSRCDIR)/WebCore/lib
+GENERATE_OBJECTS = $(CXXYACCOBJECTS)
+
LIBRARY = libkjs.a
CLEAN_FILES = $(OBJECTS) \
@@ -89,7 +91,7 @@ CLEAN_FILES = $(OBJECTS) \
grammar.cpp.h \
testkjs.o \
$(LIBRARY) \
- $(PROGRAM) \
+ $(PROGRAMS) \
$(NULL)
#----------------------------------------------------------------------
@@ -100,13 +102,13 @@ YACCFLAGS = -d --output-file=grammar.cpp --name-prefix=kjsyy
#----------------------------------------------------------------------
# Set targets for this directory
-all: $(CXXYACCOBJECTS) $(OBJECTS) $(LIBRARY) $(PROGRAM) export-headers export-objects
+all: generate-objects $(OBJECTS) $(LIBRARY) export-headers export-objects
$(LIBRARY): $(CXXOBJECTS)
$(AR) $(ARFLAGS) $(LIBRARY) $(CXXOBJECTS)
$(RANLIB) $(LIBRARY)
-$(PROGRAM): testkjs.o
+$(PROGRAMS): testkjs.o
$(CC) $< -o $@ -L. -lkjs
depend:
diff --git a/WebKit/Makefile.in b/WebKit/Makefile.in
index a411298..d0f49eb 100644
--- a/WebKit/Makefile.in
+++ b/WebKit/Makefile.in
@@ -10,6 +10,8 @@
all:
pbxbuild
+generate-objects:
+
clean:
pbxbuild clean
diff --git a/WebKit/WebKit.pbproj/kocienda.pbxuser b/WebKit/WebKit.pbproj/kocienda.pbxuser
index ab5c074..13a9803 100644
--- a/WebKit/WebKit.pbproj/kocienda.pbxuser
+++ b/WebKit/WebKit.pbproj/kocienda.pbxuser
@@ -15,9 +15,10 @@
ActiveTab = 0;
Frame = "{{0, 23}, {1207, 1005}}";
Split0 = {
+ ActiveTab = 2;
Frame = "{{313, 0}, {894, 1005}}";
Split0 = {
- Frame = "{{0, 25}, {894, 980}}";
+ Frame = "{{0, 663}, {894, 342}}";
};
SplitCount = 1;
Tab0 = {
@@ -53,9 +54,9 @@
};
};
Tab2 = {
- BuildMessageFrame = "{{0, 0}, {984, 213}}";
- BuildTranscriptFrame = "{{0, 222}, {984, 418}}";
- Frame = "{{0, 0}, {982, 638}}";
+ BuildMessageFrame = "{{0, 0}, {896, 213}}";
+ BuildTranscriptFrame = "{{0, 222}, {896, 418}}";
+ Frame = "{{0, 0}, {894, 638}}";
};
Tab3 = {
Frame = "{{0, 0}, {891, 295}}";
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list