From 090a409a3e62035b2d5bee96ce2de89f1b1fe56c Mon Sep 17 00:00:00 2001 From: "carlosgc@webkit.org" Date: Wed, 3 Aug 2011 07:43:44 +0000 Subject: [PATCH] [GTK] Reorganize pkg-config files https://bugs.webkit.org/show_bug.cgi?id=65548 Reviewed by Martin Robinson. .: * GNUmakefile.am: Initialize pkgconfigdir and pkgconfig_DATA which are common to all libraries. * configure.ac: Update pkg-config files. Source/JavaScriptCore: * GNUmakefile.am: * javascriptcoregtk.pc.in: Renamed from Source/WebKit/gtk/javascriptcoregtk.pc.in. Source/WebKit/gtk: * GNUmakefile.am: Remove javascriptcore pc file references. Source/WebKit2: * GNUmakefile.am: Rename pc file as webkit2gtk.pc.in. WebKit2 depends on gtk3 unconditionally so we don't need to use WEBKITGTK_PC_NAME. * webkit2gtk.pc.in: Renamed from Source/WebKit2/gtk/webkit2.pc.in. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@92263 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 11 +++++++++++ GNUmakefile.am | 2 ++ Source/JavaScriptCore/ChangeLog | 10 ++++++++++ Source/JavaScriptCore/GNUmakefile.am | 5 +++++ .../{WebKit/gtk => JavaScriptCore}/javascriptcoregtk.pc.in | 0 Source/WebKit/gtk/ChangeLog | 9 +++++++++ Source/WebKit/gtk/GNUmakefile.am | 6 +----- Source/WebKit2/ChangeLog | 12 ++++++++++++ Source/WebKit2/GNUmakefile.am | 6 ++++-- Source/WebKit2/{gtk/webkit2.pc.in => webkit2gtk.pc.in} | 0 configure.ac | 4 ++-- 11 files changed, 56 insertions(+), 9 deletions(-) rename Source/{WebKit/gtk => JavaScriptCore}/javascriptcoregtk.pc.in (100%) rename Source/WebKit2/{gtk/webkit2.pc.in => webkit2gtk.pc.in} (100%) diff --git a/ChangeLog b/ChangeLog index e6ac8cb4..cf3d940 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2011-08-03 Carlos Garcia Campos + + [GTK] Reorganize pkg-config files + https://bugs.webkit.org/show_bug.cgi?id=65548 + + Reviewed by Martin Robinson. + + * GNUmakefile.am: Initialize pkgconfigdir and pkgconfig_DATA which + are common to all libraries. + * configure.ac: Update pkg-config files. + 2011-08-02 Varun Jain Missing null check in WebViewImpl::selectionRange diff --git a/GNUmakefile.am b/GNUmakefile.am index c9ec407..695cd4c 100644 --- a/GNUmakefile.am +++ b/GNUmakefile.am @@ -40,6 +40,7 @@ GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector WebCore := $(srcdir)/Source/WebCore WebKit := $(srcdir)/Source/WebKit/gtk WebKit2 := $(srcdir)/Source/WebKit2 +pkgconfigdir := $(libdir)/pkgconfig # Libraries and support components bin_PROGRAMS := @@ -89,6 +90,7 @@ BUILT_SOURCES := CLEANFILES := DISTCLEANFILES := MAINTAINERCLEANFILES := +pkgconfig_DATA := # We do not care at all about this implicit built-in make rules, # disable them to save some build time diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog index fb32600..d6017f4 100644 --- a/Source/JavaScriptCore/ChangeLog +++ b/Source/JavaScriptCore/ChangeLog @@ -1,3 +1,13 @@ +2011-08-03 Carlos Garcia Campos + + [GTK] Reorganize pkg-config files + https://bugs.webkit.org/show_bug.cgi?id=65548 + + Reviewed by Martin Robinson. + + * GNUmakefile.am: + * javascriptcoregtk.pc.in: Renamed from Source/WebKit/gtk/javascriptcoregtk.pc.in. + 2011-08-01 David Levin Add asserts to RefCounted to make sure ref/deref happens on the right thread. diff --git a/Source/JavaScriptCore/GNUmakefile.am b/Source/JavaScriptCore/GNUmakefile.am index 8b3e453..8daefb8 100644 --- a/Source/JavaScriptCore/GNUmakefile.am +++ b/Source/JavaScriptCore/GNUmakefile.am @@ -73,6 +73,8 @@ javascriptcore_cflags += \ $(GLIB_CFLAGS) \ $(UNICODE_CFLAGS) +pkgconfig_DATA += Source/JavaScriptCore/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc + Source/JavaScriptCore/Lexer.lut.h: $(srcdir)/Source/JavaScriptCore/create_hash_table $(srcdir)/Source/JavaScriptCore/parser/Keywords.table $(AM_V_GEN)$(PERL) $^ > $@ @@ -175,3 +177,6 @@ CLEANFILES += \ Programs/jsc \ Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@ \ Programs/minidom + +DISTCLEANFILES += \ + $(top_builddir)/Source/JavaScriptCore/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc diff --git a/Source/WebKit/gtk/javascriptcoregtk.pc.in b/Source/JavaScriptCore/javascriptcoregtk.pc.in similarity index 100% rename from Source/WebKit/gtk/javascriptcoregtk.pc.in rename to Source/JavaScriptCore/javascriptcoregtk.pc.in diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog index 59ef3bb..4a121b6 100644 --- a/Source/WebKit/gtk/ChangeLog +++ b/Source/WebKit/gtk/ChangeLog @@ -1,3 +1,12 @@ +2011-08-03 Carlos Garcia Campos + + [GTK] Reorganize pkg-config files + https://bugs.webkit.org/show_bug.cgi?id=65548 + + Reviewed by Martin Robinson. + + * GNUmakefile.am: Remove javascriptcore pc file references. + 2011-07-30 Patrick Gansterer Remove inclusion of MainThread.h from Threading.h diff --git a/Source/WebKit/gtk/GNUmakefile.am b/Source/WebKit/gtk/GNUmakefile.am index 81c834b..cdbd28b 100644 --- a/Source/WebKit/gtk/GNUmakefile.am +++ b/Source/WebKit/gtk/GNUmakefile.am @@ -258,10 +258,7 @@ webkitgtk_sources += \ Source/WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \ Source/WebKit/gtk/webkit/webkitwebwindowfeaturesprivate.h -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = \ - Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc \ - Source/WebKit/gtk/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc +pkgconfig_DATA += Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc if ENABLE_INTROSPECTION @@ -594,7 +591,6 @@ DISTCLEANFILES += \ $(top_builddir)/Source/WebKit/gtk/docs/version.xml \ $(top_builddir)/Source/WebKit/gtk/docs/GNUmakefile \ $(top_builddir)/Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc \ - $(top_builddir)/Source/WebKit/gtk/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc \ $(top_builddir)/Source/WebKit/gtk/org.webkitgtk-@WEBKITGTK_API_VERSION@.gschema.xml \ $(top_builddir)/Source/WebKit/gtk/webkit/webkitversion.h diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index fc7f8cd..ef442ab 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,15 @@ +2011-08-03 Carlos Garcia Campos + + [GTK] Reorganize pkg-config files + https://bugs.webkit.org/show_bug.cgi?id=65548 + + Reviewed by Martin Robinson. + + * GNUmakefile.am: Rename pc file as webkit2gtk.pc.in. WebKit2 + depends on gtk3 unconditionally so we don't need to use + WEBKITGTK_PC_NAME. + * webkit2gtk.pc.in: Renamed from Source/WebKit2/gtk/webkit2.pc.in. + 2011-08-01 Michael Saboff Virtual copying of FastMalloc allocated memory causes madvise MADV_FREE_REUSABLE errors diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am index 21d4828..f25123c 100644 --- a/Source/WebKit2/GNUmakefile.am +++ b/Source/WebKit2/GNUmakefile.am @@ -907,7 +907,7 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIB $(UNICODE_LIBS) \ $(XT_LIBS) -pkgconfig_DATA += Source/WebKit2/gtk/@WEBKITGTK_PC_NAME@2-@WEBKITGTK_API_VERSION@.pc +pkgconfig_DATA += Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc # WebKit2 specific variables forwarding_headers := $(GENSOURCES_WEBKIT2)/include @@ -954,9 +954,11 @@ DerivedSources/WebKit2/%Messages.h: %.messages.in $(message_gen_scripts) CLEANFILES += \ $(BUILT_SOURCES) \ - $(top_builddir)/WebKit2/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc \ $(top_builddir)/Programs/WebKitWebProcess +DISTCLEANFILES += \ + $(top_builddir)/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc + # WebKitWebProcess bin_PROGRAMS += \ Programs/WebKitWebProcess diff --git a/Source/WebKit2/gtk/webkit2.pc.in b/Source/WebKit2/webkit2gtk.pc.in similarity index 100% rename from Source/WebKit2/gtk/webkit2.pc.in rename to Source/WebKit2/webkit2gtk.pc.in diff --git a/configure.ac b/configure.ac index abf11a5..b1b32e4 100644 --- a/configure.ac +++ b/configure.ac @@ -1237,14 +1237,14 @@ AC_CONFIG_FILES([ Source/WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/webkit.pc.in Source/WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:Source/WebKit/gtk/JSCore.gir.in Source/WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:Source/WebKit/gtk/org.webkitgtk.gschema.xml.in -Source/WebKit/gtk/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit/gtk/javascriptcoregtk.pc.in +Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc:Source/JavaScriptCore/javascriptcoregtk.pc.in ] ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME] ) if test "$enable_webkit2" = "yes"; then AC_CONFIG_FILES([ - Source/WebKit2/gtk/${WEBKITGTK_PC_NAME}2-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/gtk/webkit2.pc.in + Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in ] ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME] ) -- 1.8.3.1