Build fix.

[WebKit-https.git] / GNUmakefile.am

diff --git a/GNUmakefile.am b/GNUmakefile.am
index b5ff680155ffdab4c506d18f356be1897eb8ab98..aa6419efbc5a836dbaacc76708b7cb80fd9f76f2 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -1,4 +1,28 @@
-AUTOMAKE_OPTIONS = subdir-objects
+# Top-level Makefile rule for automake
+#
+# Variable conventions:
+#
+# _h_api            = API headers that will be installed and included in the distribution
+# _cppflags         = flags that will be passed to the C/CXX Preprocessor
+# _sources          = sources that will be compiled and included in the distribution
+# _headers          = header files that will be part of the distribution
+# _built_sources    = files that will be autogenerated by the build system and
+#                     will be part of the _SOURCES primary
+# _built_nosources  = files that are autogenerated but are not part of the
+#                     _SOURCES primary
+# _cleanfiles       = files that will be removed by the clean target
+#
+# Sources, headers, flags, etc... should be added to the respective variables
+# with the above suffix, e.g, webcore-specific sources should go to
+# webcore_sources, gtk port-specific flags should go to webkitgtk_cppflags,
+# etc... The only exceptions are the global variables. See Global Variables below.
+#
+# Global Variables
+#
+# global_cppflags   = CPPFLAGS that apply to JSC, WebCore, and to any
+#                     specific port
+# global_cflags     = CFLAGS and CXXFLAGS that apply to JSC, WebCore, and to
+#                     any specific port

 
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 srcdir = @srcdir@
 VPATH = @srcdir@


@@ -44,27 +68,16 @@ global_cflags := \
 # Libraries
 lib_LTLIBRARIES = libJavaScriptCore.la libWebKitGtk.la
 
 # Libraries
 lib_LTLIBRARIES = libJavaScriptCore.la libWebKitGtk.la
 

-# JavaScriptCore
-
-# Following are the variables we use in JavaScripCore/GNUmakefile.am
-#
-# javascriptcore_h_api - api headers to be included in the JSC library
-# javascriptcore_cppflags - CPP flags for JSC
-# javascriptcore_sources - source files to be included
-# javascriptcore_built_sources - autogenerated sources and/or header files that are part of _SOURCES
-# javascriptcore_built_nosources - same as above but not part of _SOURCES

 #
 #

-# If you add or remove sources or header files, make sure you update the
-# following variables in JavaScriptCore/GNUmakefile.am
-
+# JavaScriptCore

 javascriptcore_h_api :=
 javascriptcore_cppflags:=
 javascriptcore_sources :=
 javascriptcore_built_sources := 
 javascriptcore_built_nosources :=
 
 javascriptcore_h_api :=
 javascriptcore_cppflags:=
 javascriptcore_sources :=
 javascriptcore_built_sources := 
 javascriptcore_built_nosources :=
 

-# The variables above are already included below so we don't need to touch
-# these variables too often
+# The variables above are already included below so no need to touch
+# these variables unless you really have to

 libJavaScriptCore_ladir = $(prefix)/include/WebKit/JavaScriptCore
 libJavaScriptCore_la_HEADERS := $(javascriptcore_h_api)
 
 libJavaScriptCore_ladir = $(prefix)/include/WebKit/JavaScriptCore
 libJavaScriptCore_la_HEADERS := $(javascriptcore_h_api)
 


@@ -80,20 +93,23 @@ libJavaScriptCore_la_CFLAGS := $(global_cflags)
 
 libJavaScriptCore_la_CPPFLAGS := $(global_cppflags) $(javascriptcore_cppflags)
 
 
 libJavaScriptCore_la_CPPFLAGS := $(global_cppflags) $(javascriptcore_cppflags)
 

-# WebKitGtk 
-
-# The Following variables have the same meaning as JSC, with addition of:

 #
 #

-# webcore_sources - These are port-independent sources and header files
-# webkitgtk_headers - header files that will be included in _SOURCES
-
+# WebCore
+webcore_cppflags :=

 webcore_sources :=
 webcore_sources :=

+webcore_headers :=
+webcore_built_sources :=
+webcore_built_nosources :=
+
+# WebKitGtk

 webkitgtk_h_api :=
 webkitgtk_headers :=
 webkitgtk_sources :=
 webkitgtk_cppflags :=
 webkitgtk_h_api :=
 webkitgtk_headers :=
 webkitgtk_sources :=
 webkitgtk_cppflags :=

+webkitgtk_ldflags :=

 webkitgtk_built_sources :=
 webkitgtk_built_nosources :=
 webkitgtk_built_sources :=
 webkitgtk_built_nosources :=

+webkitgtk_cleanfiles :=

 
 # No need to touch the following variables unless you have to. If you need to change the values
 # for the following variables, use the "webkitgtk_" variables above
 
 # No need to touch the following variables unless you have to. If you need to change the values
 # for the following variables, use the "webkitgtk_" variables above


@@ -102,6 +118,8 @@ libWebKitGtk_ladir := $(prefix)/include/WebKit
 libWebKitGtk_la_HEADERS := $(webkitgtk_h_api)
 
 libWebKitGtk_la_SOURCES := \
 libWebKitGtk_la_HEADERS := $(webkitgtk_h_api)
 
 libWebKitGtk_la_SOURCES := \

+       $(webcore_built_sources) \
+       $(webcore_headers) \

        $(webcore_sources) \
        $(webkitgtk_built_sources) \
        $(webkitgtk_headers) \
        $(webcore_sources) \
        $(webkitgtk_built_sources) \
        $(webkitgtk_headers) \


@@ -111,7 +129,6 @@ libWebKitGtk_la_CXXFLAGS := \
        -fno-rtti \
        $(global_cflags) \
        $(DEPENDENCIES_CFLAGS) \
        -fno-rtti \
        $(global_cflags) \
        $(DEPENDENCIES_CFLAGS) \

-       $(ICU_CFLAGS) \

        $(SQLITE3_CFLAGS) \
        $(GSTREAMER_CFLAGS) \
        $(LIBXSLT_CFLAGS) \
        $(SQLITE3_CFLAGS) \
        $(GSTREAMER_CFLAGS) \
        $(LIBXSLT_CFLAGS) \


@@ -120,7 +137,6 @@ libWebKitGtk_la_CXXFLAGS := \
 libWebKitGtk_la_CFLAGS := \
        $(global_cflags) \
        $(DEPENDENCIES_CFLAGS) \
 libWebKitGtk_la_CFLAGS := \
        $(global_cflags) \
        $(DEPENDENCIES_CFLAGS) \

-       $(ICU_CFLAGS) \

        $(SQLITE3_CFLAGS) \
        $(GSTREAMER_CFLAGS) \
        $(LIBXSLT_CFLAGS) \
        $(SQLITE3_CFLAGS) \
        $(GSTREAMER_CFLAGS) \
        $(LIBXSLT_CFLAGS) \


@@ -128,30 +144,34 @@ libWebKitGtk_la_CFLAGS := \
 
 libWebKitGtk_la_CPPFLAGS := \
        $(global_cppflags) \
 
 libWebKitGtk_la_CPPFLAGS := \
        $(global_cppflags) \

+       $(webcore_cppflags) \

        $(webkitgtk_cppflags)
 
        $(webkitgtk_cppflags)
 

-libWebKitGtk_la_LIBADD := @LTLIBOBJS@ libJavaScriptCore.la 
+libWebKitGtk_la_LIBADD := @LTLIBOBJS@ libJavaScriptCore.la

 
 libWebKitGtk_la_LDFLAGS := \
 
 libWebKitGtk_la_LDFLAGS := \

+       $(webkitgtk_ldflags) \

        $(DEPENDENCIES_LIBS) \
        $(ICU_LIBS) \
        $(SQLITE3_LIBS) \
        $(GSTREAMER_LIBS) \
        $(LIBXSLT_LIBS) \
        $(DEPENDENCIES_LIBS) \
        $(ICU_LIBS) \
        $(SQLITE3_LIBS) \
        $(GSTREAMER_LIBS) \
        $(LIBXSLT_LIBS) \

-       $(COVERAGE_LDFLAGS)
-
-libWebKitGtk_la_LDFLAGS += \
+       $(COVERAGE_LDFLAGS) \

        -lpthread \
        -ljpeg \
        -version-info @LIBWEBKITGTK_VERSION@
 
        -lpthread \
        -ljpeg \
        -version-info @LIBWEBKITGTK_VERSION@
 

+#

 # Extra checks and flags
 # Extra checks and flags

-

 global_cppflags += \
        -DBUILDING_GTK__=1 \
        -DUSE_SYSTEM_MALLOC \
        -DWTF_CHANGES
 
 global_cppflags += \
        -DBUILDING_GTK__=1 \
        -DUSE_SYSTEM_MALLOC \
        -DWTF_CHANGES
 

+if TARGET_X11
+global_cppflags += -DXP_UNIX
+endif
+

 if !ENABLE_DEBUG
 global_cppflags += -DNDEBUG
 else 
 if !ENABLE_DEBUG
 global_cppflags += -DNDEBUG
 else 


@@ -160,21 +180,19 @@ webkitgtk_cppflags += \
        -DGDK_PIXBUF_DISABLE_DEPRECATED \
        -DGDK_DISABLE_DEPRECATED \
        -DGTK_DISABLE_DEPRECATED \
        -DGDK_PIXBUF_DISABLE_DEPRECATED \
        -DGDK_DISABLE_DEPRECATED \
        -DGTK_DISABLE_DEPRECATED \

-       -DPANGO_DISABLE_DEPRECATED \
-       -DGDK_MULTIHEAD_SAFE \
-       -DGTK_MULTIHEAD_SAFE
-endif
+       -DPANGO_DISABLE_DEPRECATED

 
 

-if TARGET_X11
-global_cppflags += -DXP_UNIX
+# Might be useful in the future
+#      -DGDK_MULTIHEAD_SAFE \
+#      -DGTK_MULTIHEAD_SAFE

 endif
 
 endif
 

-if OS_LINUX
-global_cppflags += -DHAVE_STDINT_H
+if !ENABLE_DATABASE
+global_cppflags += -DENABLE_DATABASE=0

 endif
 
 endif
 

-if OS_FREEBSD
-global_cppflags += -DHAVE_PTHREAD_NP_H
+if !ENABLE_ICONDATABASE
+global_cppflags += -DENABLE_ICONDATABASE=0

 endif
 
 if ENABLE_COVERAGE
 endif
 
 if ENABLE_COVERAGE


@@ -184,11 +202,11 @@ global_cppflags += \
 endif
 
 if ENABLE_VIDEO
 endif
 
 if ENABLE_VIDEO

-libWebKitGtk_la_LDFLAGS += -lgstinterfaces-0.10 -lgstvideo-0.10
+webkitgtk_ldflags += -lgstinterfaces-0.10 -lgstvideo-0.10

 endif
 
 endif
 

-# WebKit/GTK+ sources
-
+#
+# WEBKIT GTK+

 webkitgtk_cppflags += \
 -I $(top_builddir)/WebKit/gtk/WebView \
 -DBUILDING_CAIRO__=1 \
 webkitgtk_cppflags += \
 -I $(top_builddir)/WebKit/gtk/WebView \
 -DBUILDING_CAIRO__=1 \


@@ -214,7 +232,7 @@ webkitgtk_headers += \
        WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
        WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
        WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \
        WebKit/gtk/WebCoreSupport/EditorClientGtk.h \
        WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \
        WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \

-       WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h 
+       WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h

 
 webkitgtk_sources += \
        WebKit/gtk/WebView/webkitnetworkrequest.cpp \
 
 webkitgtk_sources += \
        WebKit/gtk/WebView/webkitnetworkrequest.cpp \


@@ -230,6 +248,10 @@ webkitgtk_sources += \
        WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
        WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp 
 
        WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \
        WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp 
 

+webkitgtk_cleanfiles += \
+       $(top_builddir)/Programs/GtkLauncher \
+       $(top_builddir)/WebKit/gtk/WebKitGtk.pc
+

 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = WebKit/gtk/WebKitGtk.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = WebKit/gtk/WebKitGtk.pc
 


@@ -248,21 +270,14 @@ WebKit/gtk/WebView/webkit-marshal.h: stamp-webkit-marshal.h
 
 stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST)
        echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \
 
 stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST)
        echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \

-       $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) \
-       --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \
+       $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \

        echo timestamp > $(@F)
 
 stamp-webkit-marshal.h: $(WEBKIT_MARSHAL_LIST)
        echo timestamp > $(@F)
 
 stamp-webkit-marshal.h: $(WEBKIT_MARSHAL_LIST)

-       $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) \
-       --header > $(WEBKIT_MARSHAL).h && \
+       $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \

        echo timestamp > $(@F)
 
        echo timestamp > $(@F)
 

-# Autogenerated sources
-BUILT_SOURCES := \
-       $(javascriptcore_built_sources) \
-       $(javascriptcore_built_nosources) \
-       $(webkitgtk_built_sources) \
-       $(webkitgtk_built_nosources)
+# END WEBKIT GTK+

 
 # Files that will be cleaned
 MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES)
 
 # Files that will be cleaned
 MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES)


@@ -274,14 +289,28 @@ include JavaScriptCore/GNUmakefile.am
 include WebCore/GNUmakefile.am
 include WebKitTools/GNUmakefile.am
 
 include WebCore/GNUmakefile.am
 include WebKitTools/GNUmakefile.am
 

-# Project-wide clean rules
-clean-local:
-       -rm -rf $(GENSOURCES)
-       -rm -f $(top_builddir)/Programs/GtkLauncher $(top_builddir)/Programs/DumpRenderTree
-       -rm -f $(top_builddir)/Programs/testkjs $(top_builddir)/Programs/dftables
-       -rm -f $(top_builddir/WebKit/gtk/WebKitGtk-1.0.pc

 
 

-distclean-local:
-       -rm -f $(srcdir)/aconfig.h.in configure config.* GNUmakefile.in \
-               INSTALL README
+# Autogenerated sources
+BUILT_SOURCES := \
+       $(javascriptcore_built_sources) \
+       $(javascriptcore_built_nosources) \
+       $(webcore_built_sources) \
+       $(webcore_built_nosources) \
+       $(webkitgtk_built_sources) \
+       $(webkitgtk_built_nosources)

 
 

+# Project-wide clean rules
+CLEANFILES += \
+       $(webkitgtk_cleanfiles) \
+       $(top_builddir)/Programs/DumpRenderTree \
+       $(top_builddir)/Programs/testkjs \
+       $(top_builddir)/Programs/dftables \
+       $(GENSOURCES)
+
+MAINTAINERCLEANFILES += \
+       $(srcdir)/aconfig.h.in \
+       configure \
+       config.* \
+       GNUmakefile.in \
+       INSTALL \
+       README