third_party/WebKit/WebCore/GNUmakefile.am - Issue 10670: Do another merge using nifty new merge script (CL for that coming soon).

Side by Side Diff: third_party/WebKit/WebCore/GNUmakefile.am

Issue 10670: Do another merge using nifty new merge script (CL for that coming soon). (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 12 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « third_party/WebKit/WebCore/ChangeLog ('k') | third_party/WebKit/WebCore/WebCore.pro » ('j') | no next file with comments »

OLD	NEW
1	1

2 WebCore := $(srcdir)/WebCore	2 WebCore := $(srcdir)/WebCore

3	3

4 FEATURE_DEFINES_JAVASCRIPT := LANGUAGE_JAVASCRIPT=1	4 FEATURE_DEFINES_JAVASCRIPT := LANGUAGE_JAVASCRIPT=1

5 SVG_FEATURES :=	5 SVG_FEATURES :=

6 HTML_FEATURES :=	6 HTML_FEATURES :=

7	7

8 WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSPropertyNames.in	8 WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSPropertyNames.in

9 WEBCORE_CSS_VALUE_KEYWORDS := $(WebCore)/css/CSSValueKeywords.in	9 WEBCORE_CSS_VALUE_KEYWORDS := $(WebCore)/css/CSSValueKeywords.in

10	10

(...skipping 1222 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1233 WebCore/platform/graphics/AffineTransform.h \	1233 WebCore/platform/graphics/AffineTransform.h \

1234 WebCore/platform/graphics/BitmapImage.cpp \	1234 WebCore/platform/graphics/BitmapImage.cpp \

1235 WebCore/platform/graphics/BitmapImage.h \	1235 WebCore/platform/graphics/BitmapImage.h \

1236 WebCore/platform/graphics/Color.cpp \	1236 WebCore/platform/graphics/Color.cpp \

1237 WebCore/platform/graphics/Color.h \	1237 WebCore/platform/graphics/Color.h \

1238 WebCore/platform/graphics/DashArray.h \	1238 WebCore/platform/graphics/DashArray.h \

1239 WebCore/platform/graphics/FloatPoint.cpp \	1239 WebCore/platform/graphics/FloatPoint.cpp \

1240 WebCore/platform/graphics/FloatPoint.h \	1240 WebCore/platform/graphics/FloatPoint.h \

1241 WebCore/platform/graphics/FloatPoint3D.cpp \	1241 WebCore/platform/graphics/FloatPoint3D.cpp \

1242 WebCore/platform/graphics/FloatPoint3D.h \	1242 WebCore/platform/graphics/FloatPoint3D.h \

	1243 WebCore/platform/graphics/FloatQuad.cpp \

1243 WebCore/platform/graphics/FloatRect.cpp \	1244 WebCore/platform/graphics/FloatRect.cpp \

1244 WebCore/platform/graphics/FloatRect.h \	1245 WebCore/platform/graphics/FloatRect.h \

1245 WebCore/platform/graphics/FloatSize.cpp \	1246 WebCore/platform/graphics/FloatSize.cpp \

1246 WebCore/platform/graphics/FloatSize.h \	1247 WebCore/platform/graphics/FloatSize.h \

1247 WebCore/platform/graphics/Font.cpp \	1248 WebCore/platform/graphics/Font.cpp \

1248 WebCore/platform/graphics/Font.h \	1249 WebCore/platform/graphics/Font.h \

1249 WebCore/platform/graphics/FontCache.cpp \	1250 WebCore/platform/graphics/FontCache.cpp \

1250 WebCore/platform/graphics/FontCache.h \	1251 WebCore/platform/graphics/FontCache.h \

1251 WebCore/platform/graphics/FontData.cpp \	1252 WebCore/platform/graphics/FontData.cpp \

1252 WebCore/platform/graphics/FontData.h \	1253 WebCore/platform/graphics/FontData.h \

(...skipping 1712 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2965 dist_webinspectorimages_DATA = \	2966 dist_webinspectorimages_DATA = \

2966 $(shell ls $(WebCore)/inspector/front-end/Images/*.png)	2967 $(shell ls $(WebCore)/inspector/front-end/Images/*.png)

2967	2968

2968 # Clean rules for WebCore	2969 # Clean rules for WebCore

2969	2970

2970 CLEANFILES += \	2971 CLEANFILES += \

2971 libWebCoreJS.la \	2972 libWebCoreJS.la \

2972 WebCore/bindings/js/JSDOMWindowBase.lut.h \	2973 WebCore/bindings/js/JSDOMWindowBase.lut.h \

2973 WebCore/bindings/js/JSRGBColor.lut.h	2974 WebCore/bindings/js/JSRGBColor.lut.h

2974	2975

OLD	NEW