Merge "[WK2] selection does not disappear after coping the text" into 2.0_beta

[framework/web/webkit-efl.git] / GNUmakefile.am

diff --git a/GNUmakefile.am b/GNUmakefile.am
old mode 100755 (executable)
new mode 100644 (file)
index d3d74e0..edd9c86
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -54,7 +54,13 @@ lib_LTLIBRARIES :=
 IDL_BINDINGS :=
 TEST_PROGS :=
 POFILES :=
+PO_LINGUAS :=
+USER_LINGUAS :=
+USE_LINGUAS :=
 MOFILES :=
+ALL_MOFILES :=
+dom_binding_idls :=
+wtf_sources :=
 javascriptcore_h_api :=
 javascriptcore_cppflags:=
 javascriptcore_cflags :=
@@ -62,6 +68,7 @@ javascriptcore_sources :=
 javascriptcore_built_sources :=
 javascriptcore_built_nosources :=
 webcore_cppflags :=
+webcore_modules_sources :=
 webcore_sources :=
 webcore_libadd :=
 webcore_built_sources :=
@@ -76,10 +83,16 @@ webkitgtk_cppflags :=
 webkitgtk_gdom_built_sources :=
 webkitgtk_built_sources :=
 webkitgtk_built_nosources :=
+webkit2_h_api :=
+webkit2_sources :=
 webkit2_built_sources :=
+webkit2gtk_h_api :=
+webkit2gtk_built_sources :=
+webkit2_plugin_process_sources :=
 webkit2_plugin_process_built_sources :=
 webkittestrunner_built_sources :=
 libwebcoreinternals_built_sources :=
+minibrowser_built_sources :=
 global_cppflags :=
 global_cflags :=
 global_cxxflags :=
@@ -136,14 +149,33 @@ endif
 global_cppflags += \
        -DBUILDING_CAIRO__=1 \
        -DBUILDING_GTK__=1 \
+       -DBUILDING_SOUP__=1 \
        -DWTF_CHANGES
 
+if ENABLE_WEBKIT2
+global_cppflags += \
+       -DBUILDING_WEBKIT2__=1
+endif
+
 # For the Gtk port we want to use XP_UNIX both in X11 and Mac
 if !TARGET_WIN32
 global_cppflags += \
        -DXP_UNIX
 endif
 
+# Add MOZ_X11 for X11 targets only
+if TARGET_X11
+global_cppflags += \
+       -DMOZ_X11
+endif
+
+# Use the wide character version of win32 API by default
+if TARGET_WIN32
+global_cppflags += \
+       -DUNICODE \
+       -D_UNICODE
+endif
+
 if USE_ICU_UNICODE
 global_cppflags += \
        -DWTF_USE_ICU_UNICODE=1
@@ -164,6 +196,39 @@ global_cppflags += \
        -DWTF_USE_GSTREAMER=1
 endif
 
+if USE_ACCELERATED_COMPOSITING
+global_cppflags += \
+       -DWTF_USE_ACCELERATED_COMPOSITING=1 \
+       -DENABLE_3D_RENDERING=1
+endif
+
+if USE_TEXTURE_MAPPER_CAIRO
+global_cppflags += \
+       -DWTF_USE_TEXTURE_MAPPER=1 \
+       -DWTF_USE_TEXTURE_MAPPER_CAIRO=1
+endif
+
+if USE_TEXTURE_MAPPER_GL
+global_cppflags += \
+       -DWTF_USE_TEXTURE_MAPPER=1 \
+       -DWTF_USE_TEXTURE_MAPPER_GL=1
+endif
+
+if USE_CLUTTER
+global_cppflags += \
+       -DWTF_USE_CLUTTER=1
+endif
+
+if USE_GLX
+global_cppflags += \
+       -DWTF_USE_GLX=1
+endif
+
+if USE_OPENGL
+global_cppflags += \
+       -DWTF_USE_OPENGL=1
+endif
+
 # ----
 # GTK+ 2.x/3.x support
 # ----
@@ -176,7 +241,6 @@ if !ENABLE_DEBUG
 global_cppflags += -DNDEBUG
 else
 global_cppflags += \
-       -DG_DISABLE_DEPRECATED \
        -DGDK_PIXBUF_DISABLE_DEPRECATED \
        -DGDK_DISABLE_DEPRECATED \
        -DGTK_DISABLE_DEPRECATED \
@@ -197,10 +261,8 @@ EXTRA_DIST += \
        $(srcdir)/Source/WebKit/LICENSE
 
 # Include module makefiles
-if USE_JSC
+include Source/WTF/GNUmakefile.am
 include Source/JavaScriptCore/GNUmakefile.am
-endif
-
 include Source/WebCore/GNUmakefile.am
 include Source/WebKit/gtk/GNUmakefile.am
 include Source/WebCore/bindings/gobject/GNUmakefile.am
@@ -208,27 +270,26 @@ include Tools/GNUmakefile.am
 include Source/WebKit/gtk/po/GNUmakefile.am
 include Tools/DumpRenderTree/gtk/GNUmakefile.ImageDiff.am
 
-if ENABLE_WEBKIT2
 include Source/WebKit2/GNUmakefile.am
 include Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am
 include Tools/MiniBrowser/gtk/GNUmakefile.am
 include Tools/WebKitTestRunner/GNUmakefile.am
+include Source/ThirdParty/gtest/GNUmakefile.am
+include Tools/TestWebKitAPI/GNUmakefile.am
 # [GTK] Refactor the translations now that we have webkit2
 # https://bugs.webkit.org/show_bug.cgi?id=55153
-endif
 
 # Autogenerated sources
 BUILT_SOURCES += \
+       $(javascriptcore_built_sources) \
+       $(javascriptcore_built_nosources) \
        $(webcore_built_sources) \
        $(webcore_built_nosources) \
        $(webkitgtk_built_sources) \
-       $(webkitgtk_built_nosources)
-
-if USE_JSC
-BUILT_SOURCES += \
-       $(javascriptcore_built_sources) \
-       $(javascriptcore_built_nosources)
-endif
+       $(webkitgtk_built_nosources) \
+       $(webkit2_built_sources) \
+       $(webkit2gtk_built_sources) \
+       $(webkit2_plugin_process_built_sources)
 
 DISTCLEANFILES += \
        $(CLEANFILES) \