Changeset 30702 in webkit


Ignore:
Timestamp:
Mar 2, 2008 11:51:26 AM (16 years ago)
Author:
alp@webkit.org
Message:

2008-03-02 Alp Toker <alp@atoker.com>

Reviewed by Mark Rowe.

Split the WebKit GTK+ build out of the WebCore build and change the
shared object name to match the package name.

  • GNUmakefile.am:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r30645 r30702  
     12008-03-02  Alp Toker  <alp@atoker.com>
     2
     3        Reviewed by Mark Rowe.
     4
     5        Split the WebKit GTK+ build out of the WebCore build and change the
     6        shared object name to match the package name.
     7
     8        * GNUmakefile.am:
     9
    1102008-02-28  Alp Toker  <alp@atoker.com>
    211
  • trunk/GNUmakefile.am

    r30542 r30702  
    8080# Shared libraries
    8181lib_LTLIBRARIES = \
    82         libWebKitGtk.la
     82        libwebkit-1.0.la
    8383
    8484# Convenience libraries
    8585noinst_LTLIBRARIES = \
    86         libJavaScriptCore.la
     86        libJavaScriptCore.la \
     87        libWebCore.la
    8788
    8889#
     
    9697# The variables above are already included below so no need to touch
    9798# these variables unless you really have to
    98 libJavaScriptCore_ladir = $(prefix)/include/WebKit/JavaScriptCore
     99libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore
    99100libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api)
    100101
     
    129130webcore_sources :=
    130131webcore_headers :=
     132webcore_libadd :=
    131133webcore_built_sources :=
    132134webcore_built_nosources :=
    133135
    134 # WebKitGtk
     136webcore_cppflags += $(HILDON_CPPFLAGS)
     137
     138# WebKit
    135139webkitgtk_h_api :=
    136140webkitgtk_headers :=
    137141webkitgtk_sources :=
    138142webkitgtk_cppflags :=
    139 webkitgtk_libadd :=
    140143webkitgtk_built_sources :=
    141144webkitgtk_built_nosources :=
    142145webkitgtk_cleanfiles :=
    143146
    144 webkitgtk_cppflags += $(HILDON_CPPFLAGS)
    145 
    146 # No need to touch the following variables unless you have to. If you need to change the values
    147 # for the following variables, use the "webkitgtk_" variables above
    148 libWebKitGtk_ladir := $(prefix)/include/WebKit/webkit
    149 
    150 libWebKitGtk_la_HEADERS = $(webkitgtk_h_api)
    151 
    152 libWebKitGtk_la_SOURCES = \
     147libWebCore_la_SOURCES = \
    153148        $(webcore_built_sources) \
    154149        $(webcore_headers) \
    155         $(webcore_sources) \
    156         $(webkitgtk_built_sources) \
    157         $(webkitgtk_headers) \
    158         $(webkitgtk_sources)
    159 
    160 libWebKitGtk_la_CXXFLAGS = \
     150        $(webcore_sources)
     151
     152libWebCore_la_CXXFLAGS = \
    161153        -fno-strict-aliasing \
    162154        $(global_cxxflags) \
     
    171163        $(HILDON_CFLAGS)
    172164
    173 libWebKitGtk_la_CFLAGS = \
     165libWebCore_la_CFLAGS = \
    174166        -fno-strict-aliasing \
    175167        $(global_cflags) \
     
    183175        $(HILDON_CFLAGS)
    184176
    185 libWebKitGtk_la_CPPFLAGS = \
     177libWebCore_la_CPPFLAGS = \
    186178        $(global_cppflags) \
    187179        $(webcore_cppflags) \
     
    189181        $(ICU_CPPFLAGS)
    190182
    191 libWebKitGtk_la_LIBADD = libJavaScriptCore.la \
    192         $(webkitgtk_libadd) \
     183libWebCore_la_LIBADD = \
     184        libJavaScriptCore.la \
     185        $(webcore_libadd) \
    193186        $(GLOBALDEPS_LIBS) \
    194187        $(WEBKITDEPS_LIBS) \
     
    202195        -ljpeg
    203196
    204 libWebKitGtk_la_LDFLAGS = \
     197libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit
     198libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api)
     199
     200libwebkit_1_0_la_SOURCES = \
     201        $(webkitgtk_built_sources) \
     202        $(webkitgtk_headers) \
     203        $(webkitgtk_sources)
     204
     205libwebkit_1_0_la_CXXFLAGS = \
     206        $(libWebCore_la_CXXFLAGS)
     207
     208libwebkit_1_0_la_CFLAGS = \
     209        $(libWebCore_la_CFLAGS)
     210
     211libwebkit_1_0_la_CPPFLAGS = \
     212        $(libWebCore_la_CPPFLAGS)
     213
     214libwebkit_1_0_la_LDFLAGS = \
    205215        $(COVERAGE_LDFLAGS) \
    206216        -version-info @LIBWEBKITGTK_VERSION@
     217
     218libwebkit_1_0_la_LIBADD = \
     219        libWebCore.la
    207220
    208221#
     
    251264
    252265if ENABLE_VIDEO
    253 webkitgtk_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10
    254 endif
    255 
    256 #
    257 # WEBKIT GTK+
     266webcore_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10
     267endif
     268
    258269webkitgtk_cppflags += \
    259270-I$(top_builddir)/WebKit/gtk/webkit \
  • trunk/WebKit/gtk/ChangeLog

    r30623 r30702  
     12008-03-02  Alp Toker  <alp@atoker.com>
     2
     3        Reviewed by Mark Rowe.
     4
     5        Split the WebKit GTK+ build out of the WebCore build and change the
     6        shared object name to match the package name.
     7
     8        * webkit.pc.in:
     9
    1102008-02-27  Adam Roben  <aroben@apple.com>
    211
  • trunk/WebKit/gtk/webkit.pc.in

    r29909 r30702  
    55
    66Name: WebKit
    7 Description: Web content engine for GTK+ applications
     7Description: Web content engine for GTK+
    88Version: @VERSION@
    99Requires: gtk+-2.0
    10 Libs: -L${libdir} -lWebKitGtk
    11 Cflags: -I${includedir}/WebKit
     10Libs: -L${libdir} -lwebkit-1.0
     11Cflags: -I${includedir}/webkit-1.0
  • trunk/WebKitTools/ChangeLog

    r30701 r30702  
     12008-03-02  Alp Toker  <alp@atoker.com>
     2
     3        Reviewed by Mark Rowe.
     4
     5        Split the WebKit GTK+ build out of the WebCore build and change the
     6        shared object name to match the package name.
     7
     8        * GNUmakefile.am:
     9
    1102008-03-01  Mark Rowe  <mrowe@apple.com>
    211
  • trunk/WebKitTools/GNUmakefile.am

    r30542 r30702  
    1919        $(GLOBALDEPS_LIBS) \
    2020        $(WEBKITDEPS_LIBS) \
    21         libJavaScriptCore.la \
    22         libWebKitGtk.la
     21        libwebkit-1.0.la
    2322
    2423Programs_GtkLauncher_LDFLAGS = -rpath $(CURDIR)/.libs
     
    4948        $(GLOBALDEPS_LIBS) \
    5049        $(WEBKITDEPS_LIBS) \
    51         libJavaScriptCore.la \
    52         libWebKitGtk.la
     50        libwebkit-1.0.la
    5351
    5452Programs_DumpRenderTree_LDFLAGS = -rpath $(CURDIR)/.libs
Note: See TracChangeset for help on using the changeset viewer.