2010-07-06 Martin Robinson <mrobinson@igalia.com>
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Jul 2010 16:28:00 +0000 (16:28 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Jul 2010 16:28:00 +0000 (16:28 +0000)
        Unreviewed.

        Build fix after r62549.

        * GNUmakefile.am: Remove new variable that is no longer used.
2010-07-06  Martin Robinson  <mrobinson@igalia.com>

        Unreviewed.

        Build fix after r62549.

        * GNUmakefile.am: Generate RemoteInspector files by manually listing
        them instead of building them into libWebCoreJS.la.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@62552 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
GNUmakefile.am
WebCore/ChangeLog
WebCore/GNUmakefile.am

index 35a41e2132a4d5b2a653201ecb558090e4ffff35..3440b5f112c238340dd7a88493557f63f3cab7d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-06  Martin Robinson  <mrobinson@igalia.com>
+
+        Unreviewed.
+
+        Build fix after r62549.
+
+        * GNUmakefile.am: Remove new variable that is no longer used.
+
 2010-07-06  Ilya Tikhonovsky  <loislo@chromium.org>
 
         Reviewed by Yury Semikhatsky.
index 414cb91c4b53eb3b0f17e49db2d2fd804c11fde2..ccbe28f952cb0d9735e4b9abb5132963dc2b0940 100644 (file)
@@ -57,7 +57,6 @@ noinst_HEADERS :=
 noinst_LTLIBRARIES :=
 lib_LTLIBRARIES :=
 IDL_BINDINGS :=
-INSPECTOR_INTERFACES :=
 TEST_PROGS :=
 POFILES :=
 MOFILES :=
index 78820fe5ed62185c54c8c8d6ff6930c0512d0470..22dea584b812c8468dcf19b1f6a8c65c50d103f6 100644 (file)
@@ -1,3 +1,12 @@
+2010-07-06  Martin Robinson  <mrobinson@igalia.com>
+
+        Unreviewed.
+
+        Build fix after r62549.
+
+        * GNUmakefile.am: Generate RemoteInspector files by manually listing
+        them instead of building them into libWebCoreJS.la.
+
 2010-07-06  Darin Adler  <darin@apple.com>
 
         Reviewed by Adam Barth.
index af9283604652c1762241d2a1abf8dbd4fa3f726a..86c49a23b00b97de32c0d808216ff23f08a0ec23 100644 (file)
@@ -99,6 +99,8 @@ webcore_built_sources += \
        DerivedSources/WebCore/HTMLNames.cpp \
        DerivedSources/WebCore/HTMLNames.h \
        DerivedSources/WebCore/JSHTMLElementWrapperFactory.cpp \
+       DerivedSources/WebCore/RemoteInspectorFrontend2.cpp \
+       DerivedSources/WebCore/RemoteInspectorFrontend2.h \
        DerivedSources/WebCore/UserAgentStyleSheets.h \
        DerivedSources/WebCore/UserAgentStyleSheetsData.cpp \
        DerivedSources/WebCore/XMLNSNames.cpp \
@@ -333,8 +335,6 @@ IDL_BINDINGS += \
        WebCore/xml/XMLSerializer.idl \
        WebCore/xml/XSLTProcessor.idl
 
-INSPECTOR_INTERFACES += WebCore/inspector/InspectorFrontend2.idl
-
 webcoregtk_dom_sources = \
        WebCore/bindings/gobject/ConvertToUTF8String.cpp \
        WebCore/bindings/gobject/ConvertToUTF8String.h \
@@ -3974,6 +3974,10 @@ DerivedSources/WebCore/XMLNSNames.cpp DerivedSources/WebCore/XMLNSNames.h: $(Web
 DerivedSources/WebCore/XMLNames.cpp DerivedSources/WebCore/XMLNames.h: $(WebCore)/dom/make_names.pl $(WebCore)/xml/xmlattrs.in
        $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlattrs.in --outputDir "$(GENSOURCES_WEBCORE)"
 
+# Remote Inspector frontend
+DerivedSources/WebCore/RemoteInspectorFrontend2.cpp DerivedSources/WebCore/RemoteInspectorFrontend2.h: $(WebCore)/inspector/InspectorFrontend2.idl $(SCRIPTS_BINDINGS) $(WebCore)/inspector/CodeGeneratorInspector.pm
+       $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts -I$(WebCore)/inspector $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_PATH:%=--include "%") --outputDir "$(GENSOURCES_WEBCORE)" --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --generator Inspector $<
+
 IDL_PATH := \
     $(WebCore)/bindings/js \
     $(WebCore)/css \
@@ -3995,15 +3999,10 @@ vpath %.idl = $(IDL_PATH)
 
 DerivedSources/WebCore/JS%.h: DerivedSources/WebCore/JS%.cpp;
 
-DerivedSources/WebCore/Remote%.h: DerivedSources/WebCore/Remote%.cpp;
-
 .SECONDARY:
 DerivedSources/WebCore/JS%.cpp: %.idl $(SCRIPTS_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorJS.pm
        $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_PATH:%=--include "%") --outputDir "$(GENSOURCES_WEBCORE)" --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --generator JS $<
 
-DerivedSources/WebCore/Remote%.cpp: %.idl $(SCRIPTS_BINDINGS) $(WebCore)/inspector/CodeGeneratorInspector.pm
-       $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts -I$(WebCore)/inspector $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_PATH:%=--include "%") --outputDir "$(GENSOURCES)" --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --generator Inspector $<
-
 IDL_BINDINGS_JS_PURE := \
        WebCore/svg/ElementTimeControl.idl \
        WebCore/svg/SVGAnimatedPathData.idl \
@@ -4023,11 +4022,8 @@ IDL_BINDINGS_JS_PURE := \
 IDL_BINDINGS_JS := $(filter-out $(IDL_BINDINGS_JS_PURE),$(IDL_BINDINGS))
 
 webcore_built_nosources += $(patsubst %.idl,DerivedSources/WebCore/JS%.h,$(notdir $(IDL_BINDINGS)))
-webcore_built_nosources += $(patsubst %.idl,DerivedSources/WebCore/Remote%.h,$(notdir $(INSPECTOR_INTERFACES)))
 
-webcore_built_cpp = $(patsubst %.idl,DerivedSources/WebCore/JS%.cpp,$(notdir $(IDL_BINDINGS_JS)))
-webcore_built_cpp += $(patsubst %.idl,DerivedSources/WebCore/Remote%.cpp,$(notdir $(INSPECTOR_INTERFACES)))
-webcore_built_nosources += $(webcore_built_cpp)
+webcore_built_nosources += $(patsubst %.idl,DerivedSources/WebCore/JS%.cpp,$(notdir $(IDL_BINDINGS_JS)))
 
 webcore_built_objects = := $(patsubst %.cpp,%.lo,$(webcore_built_nosources))
 
@@ -4035,9 +4031,9 @@ $(webcore_built_objects): AM_CPPFLAGS+=$(corekit_cppflags)
 
 $(webcore_built_objects): AM_CXXFLAGS+=$(libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS)
 
-libWebCoreJS_objects := $(patsubst %.cpp,%.lo,$(webcore_built_cpp))
+libWebCoreJS_objects := $(patsubst %.idl,DerivedSources/WebCore/JS%.lo,$(notdir $(IDL_BINDINGS_JS)))
 
-libWebCoreJS_depfiles := $(patsubst %.cpp,DerivedSources/WebCore/$(DEPDIR)/%.Plo,$(notdir $(webcore_built_cpp)))
+libWebCoreJS_depfiles := $(patsubst %.idl,DerivedSources/WebCore/$(DEPDIR)/JS%.Plo,$(notdir $(IDL_BINDINGS_JS)))
 
 # Older automake versions (1.7) place Plo files in a different place:
 libWebCoreJS_depfiles += $(patsubst %.lo,$(DEPDIR)/%.Plo,$(libWebCoreJS_objects))