diff options
Diffstat (limited to 'packages/webkit/webkit-gtk/GNUmakefile.am')
| -rw-r--r-- | packages/webkit/webkit-gtk/GNUmakefile.am | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/packages/webkit/webkit-gtk/GNUmakefile.am b/packages/webkit/webkit-gtk/GNUmakefile.am index 9b2f06f88d..50149563ac 100644 --- a/packages/webkit/webkit-gtk/GNUmakefile.am +++ b/packages/webkit/webkit-gtk/GNUmakefile.am @@ -5,7 +5,6 @@ # _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 @@ -42,13 +41,12 @@ bin_PROGRAMS := noinst_PROGRAMS := +noinst_HEADERS := + lib_LIBRARIES := IDL_BINDINGS := -# Files that will be distributed -EXTRA_DIST := - # Global flags to CPP global_cppflags := @@ -96,6 +94,7 @@ javascriptcore_cppflags:= javascriptcore_sources := javascriptcore_built_sources := javascriptcore_built_nosources := +javascriptcore_dist := javascriptcore_cppflags += \ -I$(srcdir)/JavaScriptCore \ @@ -146,21 +145,18 @@ libJavaScriptCore_la_CPPFLAGS = \ # WebCore webcore_cppflags := webcore_sources := -webcore_headers := webcore_libadd := webcore_built_sources := webcore_built_nosources := +webcore_dist := webcoregtk_cppflags := webcoregtk_sources := -webcoregtk_headers := nodist_libWebCore_la_SOURCES = \ $(webcore_built_sources) libWebCore_la_SOURCES = \ - $(webcore_headers) \ $(webcore_sources) \ - $(webcoregtk_headers) \ $(webcoregtk_sources) libWebCore_la_CXXFLAGS = \ @@ -171,6 +167,7 @@ libWebCore_la_CXXFLAGS = \ $(GLOBALDEPS_CFLAGS) \ $(UNICODE_CFLAGS) \ $(WEBKITDEPS_CFLAGS) \ + $(XT_CFLAGS) \ $(LIBCURL_CFLAGS) \ $(LIBSOUP_CFLAGS) \ $(FREETYPE_CFLAGS) \ @@ -187,6 +184,7 @@ libWebCore_la_CFLAGS = \ $(GLOBALDEPS_CFLAGS) \ $(UNICODE_CFLAGS) \ $(WEBKITDEPS_CFLAGS) \ + $(XT_CFLAGS) \ $(LIBCURL_CFLAGS) \ $(LIBSOUP_CFLAGS) \ $(FREETYPE_CFLAGS) \ @@ -208,6 +206,7 @@ libWebCore_la_LIBADD = \ $(webcore_libadd) \ $(GLOBALDEPS_LIBS) \ $(WEBKITDEPS_LIBS) \ + $(XT_LIBS) \ $(LIBCURL_LIBS) \ $(LIBSOUP_LIBS) \ $(FREETYPE_LIBS) \ @@ -221,7 +220,6 @@ libWebCore_la_LIBADD = \ # WebKit webkitgtk_h_api := -webkitgtk_headers := webkitgtk_sources := webkitgtk_cppflags := webkitgtk_built_sources := @@ -237,7 +235,6 @@ libwebkit_1_0_la_HEADERS = \ WebKit/gtk/webkit/webkitenumtypes.h libwebkit_1_0_la_SOURCES = \ - $(webkitgtk_headers) \ $(webkitgtk_sources) libwebkit_1_0_la_CXXFLAGS = \ @@ -253,6 +250,7 @@ libwebkit_1_0_la_CPPFLAGS = \ libwebkit_1_0_la_LDFLAGS = \ $(COVERAGE_LDFLAGS) \ -version-info @LIBWEBKITGTK_VERSION@ \ + -Wl,--version-script,$(srcdir)/symbols.filter \ $(no_undefined) libwebkit_1_0_la_LIBADD = \ @@ -272,7 +270,6 @@ endif if TARGET_X11 global_cppflags += -DXP_UNIX -webcore_libadd += -lXt endif if !ENABLE_DEBUG @@ -320,37 +317,35 @@ webkitgtk_h_api += \ WebKit/gtk/webkit/webkitwebview.h webkitgtk_built_sources += \ - DerivedSources/webkitmarshal.h \ - DerivedSources/webkitmarshal.cpp \ DerivedSources/webkitenumtypes.cpp \ + DerivedSources/webkitmarshal.cpp \ + DerivedSources/webkitmarshal.h \ WebKit/gtk/webkit/webkitenumtypes.h -webkitgtk_headers += \ - WebKit/gtk/webkit/webkitprivate.h \ +webkitgtk_sources += \ + WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ + WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ + WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ WebKit/gtk/WebCoreSupport/DragClientGtk.h \ + WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ WebKit/gtk/WebCoreSupport/EditorClientGtk.h \ + WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \ + WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \ - WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h - -webkitgtk_sources += \ + WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \ + WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \ WebKit/gtk/webkit/webkitnetworkrequest.cpp \ WebKit/gtk/webkit/webkitprivate.cpp \ + WebKit/gtk/webkit/webkitprivate.h \ WebKit/gtk/webkit/webkitversion.cpp \ WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ WebKit/gtk/webkit/webkitwebframe.cpp \ WebKit/gtk/webkit/webkitwebhistoryitem.cpp \ WebKit/gtk/webkit/webkitwebsettings.cpp \ - WebKit/gtk/webkit/webkitwebview.cpp \ - WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp + WebKit/gtk/webkit/webkitwebview.cpp webkitgtk_cppflags += \ -DBUILDING_WEBKIT \ @@ -403,7 +398,7 @@ stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST) WebKit/gtk/webkit/webkitenumtypes.h: stamp-webkitenumtypes.h @true -stamp-webkitenumtypes.h: $(webkitgtk_h_api) Makefile +stamp-webkitenumtypes.h: $(webkitgtk_h_api) GNUmakefile (cd $(srcdir) \ && glib-mkenums \ --fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \ @@ -425,7 +420,7 @@ stamp-webkitenumtypes.h: $(webkitgtk_h_api) Makefile && rm -f xgen-gth \ && echo timestamp > $(@F) -DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) Makefile +DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile (cd $(srcdir) \ && glib-mkenums \ --fhead "#include <config.h>\n" \ @@ -449,6 +444,11 @@ DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) Makefile && rm -f xgen-gtc # END WEBKIT GTK+ +# +# Files that will be distributed +EXTRA_DIST = \ + $(javascriptcore_dist) \ + $(webcore_dist) # Files that will be cleaned MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) |