Commit 6cc29119 authored by kocienda's avatar kocienda

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
parent d8c8c401
......@@ -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:
......
......@@ -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)
......
......@@ -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
......
......@@ -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)
......
......@@ -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)
......
......@@ -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
......
......@@ -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)
......
......@@ -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:
......
......@@ -10,6 +10,8 @@
all:
pbxbuild
generate-objects:
clean:
pbxbuild clean
......
......@@ -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}}";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment