Changeset 37403 in webkit

Timestamp:

Oct 7, 2008 5:42:37 PM (16 years ago)

Author:

alp@webkit.org

Message:

2008-10-07 Alp Toker <​alp@nuanti.com>

GTK+ build fix for older automake versions (1.7). Discussed in bug
#21392.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.am (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2008-10-07  Alp Toker  <alp@nuanti.com>
+
+        GTK+ build fix for older automake versions (1.7). Discussed in bug
+        #21392.
+
+        * GNUmakefile.am:
+
 2008-10-07  Alp Toker  <alp@nuanti.com>
 

trunk/GNUmakefile.am

@@ -152 +152 @@
 webcoregtk_cppflags :=
 webcoregtk_sources :=
+
+nodist_EXTRA_libWebCore_la_SOURCES = \
+        $(webcore_built_nosources)
 
 nodist_libWebCore_la_SOURCES = \
@@ -476 +479 @@
         README
 
+# Older automake versions (1.7) place Plo files in a different place so we need
+# to create the output directory manually.
+all-local:
+        mkdir -p $(top_builddir)/$(DEPDIR)/DerivedSources
+
 # remove built sources and program directories
 clean-local:

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-10-07  Alp Toker  <alp@nuanti.com>
+
+        GTK+ build fix for older automake versions (1.7). Discussed in bug
+        #21392.
+
+        * GNUmakefile.am:
+
 2008-10-07  Anders Carlsson  <andersca@apple.com>
 

trunk/WebCore/GNUmakefile.am

@@ -2937 +2937 @@
 webcore_built_nosources += $(patsubst %.idl,DerivedSources/JS%.h,$(notdir $(IDL_BINDINGS)))
 
+webcore_built_nosources += $(patsubst %.idl,DerivedSources/JS%.cpp,$(notdir $(IDL_BINDINGS_JS)))
+
 libWebCoreJS_objects := $(patsubst %.idl,DerivedSources/JS%.lo,$(notdir $(IDL_BINDINGS_JS)))
 
 libWebCoreJS_depfiles := $(patsubst %.idl,DerivedSources/$(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))
 
 -include $(libWebCoreJS_depfiles)