2008-01-31 Alp Toker <alp@atoker.com>
authoralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Feb 2008 07:01:18 +0000 (07:01 +0000)
committeralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Feb 2008 07:01:18 +0000 (07:01 +0000)
        Reviewed by Mark Rowe.

        Fix the pkg-config file to follow GTK+ package naming and versioning
        conventions.

        Remove unneeded dependency listings.

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

ChangeLog
GNUmakefile.am
WebKit/gtk/ChangeLog
WebKit/gtk/WebKitGtk.pc.in [deleted file]
WebKit/gtk/webkit.pc.in [new file with mode: 0644]
configure.ac

index 2fdedf2..4238966 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2008-01-31  Alp Toker  <alp@atoker.com>
 
+        Reviewed by Mark Rowe.
+
+        Fix the pkg-config file to follow GTK+ package naming and versioning
+        conventions.
+
+        Remove unneeded dependency listings.
+
+        * GNUmakefile.am:
+        * configure.ac:
+
+2008-01-31  Alp Toker  <alp@atoker.com>
+
         Rubber-stamped by Adam Roben.
 
         http://bugs.webkit.org/show_bug.cgi?id=17006
index 71cc5e8..5458d36 100644 (file)
@@ -275,10 +275,10 @@ webkitgtk_sources += \
 
 webkitgtk_cleanfiles += \
        $(top_builddir)/Programs/GtkLauncher \
-       $(top_builddir)/WebKit/gtk/WebKitGtk.pc
+       $(top_builddir)/WebKit/gtk/webkit-1.0.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = WebKit/gtk/WebKitGtk.pc
+pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
 
 WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/webkit/webkit-marshal
 WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list
index 42593c5..3c1ef3f 100644 (file)
@@ -1,5 +1,17 @@
 2008-01-31  Alp Toker  <alp@atoker.com>
 
+        Reviewed by Mark Rowe.
+
+        Fix the pkg-config file to follow GTK+ package naming and versioning
+        conventions.
+
+        Remove unneeded dependency listings.
+
+        * WebKitGtk.pc.in: Removed.
+        * webkit.pc.in: Copied from WebKit/gtk/WebKitGtk.pc.in.
+
+2008-01-31  Alp Toker  <alp@atoker.com>
+
         Rubber-stamped by Adam Roben.
 
         http://bugs.webkit.org/show_bug.cgi?id=17006
diff --git a/WebKit/gtk/WebKitGtk.pc.in b/WebKit/gtk/WebKitGtk.pc.in
deleted file mode 100644 (file)
index dec101e..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: WebKitGtk
-Description: Webkitgtk Library
-Version: @LIBWEBKITGTK_VERSION@
-Requires:glib-2.0, gobject-2.0, gthread-2.0, gdk-2.0, gtk+-2.0, pango, libcurl, cairo, fontconfig, freetype2, libxml-2.0
-Libs: -L${libdir} -lWebKitGtk @DEPENDENCIES_LIBS@ @ICU_LIBS@ @SQLITE3_LIBS@ @GSTREAMER_LIBS@ @LIBXSLT_LIBS@
-Cflags: -I${includedir}/WebKit @DEPENDENCIES_CFLAGS@ @SQLITE3_CFLAGS@ @GSTREAMER_CFLAGS@ @LIBXSLT_CFLAGS@
diff --git a/WebKit/gtk/webkit.pc.in b/WebKit/gtk/webkit.pc.in
new file mode 100644 (file)
index 0000000..43a1337
--- /dev/null
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: WebKit
+Description: Web content engine for GTK+ applications
+Version: @VERSION@
+Requires: gtk+-2.0
+Libs: -L${libdir} -lWebKitGtk
+Cflags: -I${includedir}/WebKit
index 1a7dc57..971f2aa 100644 (file)
@@ -435,7 +435,7 @@ AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
 
 AC_CONFIG_FILES([
 GNUmakefile
-WebKit/gtk/WebKitGtk.pc:WebKit/gtk/WebKitGtk.pc.in
+WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in
 ]
 )