diff options
| author | Cliff Brake <cbrake@bec-systems.com> | 2009-02-16 10:03:32 -0500 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2009-02-16 10:03:32 -0500 |
| commit | d512927cbf42dc9a3302ecac790a18d397ea012f (patch) | |
| tree | 2d624d29a763e5f9ae9b618148cfc6063e6cd50e /packages/webkit/webkit-gtk/GNUmakefile.am | |
| parent | 68e1ea7aeddc4f7efc621558dfd424cd2fe22674 (diff) | |
| parent | 3fe1150b7afa91ee59dfa6346c1f7387638b7817 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/webkit/webkit-gtk/GNUmakefile.am')
| -rw-r--r-- | packages/webkit/webkit-gtk/GNUmakefile.am | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/packages/webkit/webkit-gtk/GNUmakefile.am b/packages/webkit/webkit-gtk/GNUmakefile.am index 7aec061bd2..c74e1fa428 100644 --- a/packages/webkit/webkit-gtk/GNUmakefile.am +++ b/packages/webkit/webkit-gtk/GNUmakefile.am @@ -77,7 +77,7 @@ no_undefined = -no-undefined endif if OS_GNU -version_script = -Wl,--version-script,$(srcdir)/symbols.filter +version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter endif # Shared libraries @@ -121,7 +121,7 @@ libJavaScriptCore_la_SOURCES = \ libJavaScriptCore_la_LIBADD = \ $(UNICODE_LIBS) \ - $(GLOBALDEPS_LIBS) \ + $(GLIB_LIBS) \ -lpthread libJavaScriptCore_la_CXXFLAGS = \ @@ -132,7 +132,7 @@ libJavaScriptCore_la_CFLAGS = \ -fstrict-aliasing \ -O3 \ $(global_cflags) \ - $(GLOBALDEPS_CFLAGS) \ + $(GLIB_CFLAGS) \ $(UNICODE_CFLAGS) libJavaScriptCore_la_CPPFLAGS = \ @@ -167,7 +167,7 @@ libWebCore_la_CXXFLAGS = \ libWebCore_la_CFLAGS = \ -fno-strict-aliasing \ $(global_cflags) \ - $(GLOBALDEPS_CFLAGS) \ + $(GLIB_CFLAGS) \ $(UNICODE_CFLAGS) \ $(LIBXML_CFLAGS) \ $(CAIRO_CFLAGS) \ @@ -181,7 +181,8 @@ libWebCore_la_CFLAGS = \ $(GSTREAMER_CFLAGS) \ $(LIBXSLT_CFLAGS) \ $(COVERAGE_CFLAGS) \ - $(HILDON_CFLAGS) + $(HILDON_CFLAGS) \ + $(GEOCLUE_CFLAGS) libWebCore_la_CPPFLAGS = \ $(global_cppflags) \ @@ -194,7 +195,7 @@ libWebCore_la_LIBADD = \ libJavaScriptCore.la \ libWebCoreJS.la \ $(webcore_libadd) \ - $(GLOBALDEPS_LIBS) \ + $(GLIB_LIBS) \ $(LIBXML_LIBS) \ $(CAIRO_LIBS) \ $(PANGO_LIBS) \ @@ -210,6 +211,7 @@ libWebCore_la_LIBADD = \ $(HILDON_LIBS) \ $(JPEG_LIBS) \ $(PNG_LIBS) \ + $(GEOCLUE_LIBS) \ -lpthread # WebKit |