2009-02-12 Simon Fraser <simon.fraser@apple.com>
[WebKit-https.git] / GNUmakefile.am
index 56573a2..c74e1fa 100644 (file)
@@ -34,7 +34,7 @@ GENSOURCES := $(top_builddir)/DerivedSources
 GENPROGRAMS := $(top_builddir)/Programs
 
 # Script for creating hash tables
-CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/kjs/create_hash_table
+CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/create_hash_table
 
 # Libraries and support components
 bin_PROGRAMS :=
@@ -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
@@ -101,8 +101,8 @@ javascriptcore_dist :=
 javascriptcore_cppflags += \
        -I$(srcdir)/JavaScriptCore \
        -I$(srcdir)/JavaScriptCore/ForwardingHeaders \
+       -I$(srcdir)/JavaScriptCore/parser \
        -I$(srcdir)/JavaScriptCore/wtf \
-       -I$(srcdir)/JavaScriptCore/kjs \
        -I$(top_builddir)/DerivedSources
 
 # The variables above are already included below so no need to touch
@@ -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
@@ -308,7 +310,10 @@ webkitgtk_h_api += \
        WebKit/gtk/webkit/webkitwebframe.h \
        WebKit/gtk/webkit/webkitwebhistoryitem.h \
        WebKit/gtk/webkit/webkitwebinspector.h \
+       WebKit/gtk/webkit/webkitwebnavigationaction.h \
+       WebKit/gtk/webkit/webkitwebpolicydecision.h \
        WebKit/gtk/webkit/webkitwebsettings.h \
+       WebKit/gtk/webkit/webkitwebwindowfeatures.h \
        WebKit/gtk/webkit/webkitwebview.h
 
 webkitgtk_built_sources += \
@@ -340,8 +345,11 @@ webkitgtk_sources += \
        WebKit/gtk/webkit/webkitwebframe.cpp \
        WebKit/gtk/webkit/webkitwebhistoryitem.cpp \
        WebKit/gtk/webkit/webkitwebinspector.cpp \
+       WebKit/gtk/webkit/webkitwebnavigationaction.cpp \
+       WebKit/gtk/webkit/webkitwebpolicydecision.cpp \
        WebKit/gtk/webkit/webkitwebsettings.cpp \
-       WebKit/gtk/webkit/webkitwebview.cpp
+       WebKit/gtk/webkit/webkitwebview.cpp \
+       WebKit/gtk/webkit/webkitwebwindowfeatures.cpp
 
 webkitgtk_cppflags += \
        -DBUILDING_WEBKIT \
@@ -352,7 +360,8 @@ webkitgtk_cppflags += \
 
 webkitgtk_cleanfiles += \
        $(top_builddir)/Programs/GtkLauncher \
-       $(top_builddir)/WebKit/gtk/webkit-1.0.pc
+       $(top_builddir)/WebKit/gtk/webkit-1.0.pc \
+       $(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
@@ -450,7 +459,7 @@ EXTRA_DIST = \
 
 # Files that will be cleaned
 MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES)
-DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES)
+DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
 CLEANFILES := $(stamp_files) $(BUILT_SOURCES)
 
 # Include module makefiles
@@ -458,6 +467,28 @@ include JavaScriptCore/GNUmakefile.am
 include WebCore/GNUmakefile.am
 include WebKitTools/GNUmakefile.am
 
+# Build unit test
+noinst_PROGRAMS += Programs/UnitTests
+Programs_UnitTests_CPPFLAGS = \
+       -I$(srcdir)/WebKit/gtk \
+       -I$(top_builddir)/WebKit/gtk \
+       $(global_cppflags) \
+       $(javascriptcore_cppflags)
+
+Programs_UnitTests_SOURCES = \
+       WebKit/gtk/tests/main.c
+
+Programs_UnitTests_CFLAGS = \
+       -fno-strict-aliasing \
+       -O2 \
+       $(global_cflags) \
+       $(GLIB_CFLAGS) \
+       $(GTK_CFLAGS)
+
+Programs_UnitTests_LDADD = \
+       libwebkit-1.0.la \
+       $(GTK_LIBS)
+
 # Autogenerated sources
 BUILT_SOURCES := \
        $(javascriptcore_built_sources) \