[GTK] JSCore.gir.in has a few problems
https://bugs.webkit.org/show_bug.cgi?id=114710
Reviewed by Philippe Normand.
.:
* GNUmakefile.am: Move common GIR initialization here from WebKit1.
* configure.ac: Updated to reflect new JSC gir file location.
Source/JavaScriptCore:
* GNUmakefile.am: Add the gobject introspection steps for JavaScriptCore here,
because they are shared between WebKit1 and WebKit2.
* JavaScriptCore.gir.in: Added. Moved from the WebKit1 directory. Now written
as foreign interfaces and referencing the javascriptcoregtk library.
Source/WebKit/gtk:
* GNUmakefile.am: Updated to reflect new name and location of JavaScriptCore-x.0.gir.
* JSCore.gir.in: Removed.
Source/WebKit2:
* GNUmakefile.am: Updated to reflect new location of JavaScriptCore gir file. Share the
same autotools data task as the WebKit1 and JavaScriptCore gir installations.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@148755 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/configure.ac b/configure.ac
index dc1deb9..9ae75fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,25 +38,21 @@
# Processing of configuration files
######################################################################################
-AC_CONFIG_FILES([GNUmakefile Source/WebCore/platform/gtk/po/POTFILES])
-AC_CONFIG_FILES(
- [Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/JavaScriptCore/javascriptcoregtk.pc.in
- Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in],
- [WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME])
+AC_CONFIG_FILES([
+ GNUmakefile Source/WebCore/platform/gtk/po/POTFILES
+ Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/JavaScriptCore/javascriptcoregtk.pc.in
+ JavaScriptCore-${WEBKITGTK_API_VERSION}.gir:Source/JavaScriptCore/JavaScriptCore.gir.in])
if test "$enable_webkit1" = "yes"; then
- AC_CONFIG_FILES([Source/WebKit/gtk/webkit/webkitversion.h])
-
- AC_CONFIG_FILES([Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in],
- [WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME])
+ AC_CONFIG_FILES([
+ Source/WebKit/gtk/webkit/webkitversion.h
+ Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in])
fi
if test "$enable_webkit2" = "yes"; then
- AC_CONFIG_FILES(
- [DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h:Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in])
-
- AC_CONFIG_FILES([Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in],
- [WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME])
+ AC_CONFIG_FILES([
+ DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h:Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in
+ Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in])
fi
m4_include([Source/autotools/PrintBuildConfiguration.m4])
