diff options
| author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2012-11-03 15:13:43 +0000 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2012-11-03 15:13:43 +0000 |
| commit | 180f7ff42cc42862a39e9c18ba7556b3020bb647 (patch) | |
| tree | 5ef0deef46801d4c1b47a86a2d373533d9c0bd74 /Makefile.sources | |
| parent | ef5c8c21a6dbf5db68743704a74066e01cc9a853 (diff) | |
| parent | 45d508487af4a817fda3b536c2872f588291902b (diff) | |
| download | netsurf-180f7ff42cc42862a39e9c18ba7556b3020bb647.tar.gz netsurf-180f7ff42cc42862a39e9c18ba7556b3020bb647.tar.bz2 | |
Merge Vincent's Javascript work onto master
Diffstat (limited to 'Makefile.sources')
| -rw-r--r-- | Makefile.sources | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Makefile.sources b/Makefile.sources index 0c2356c0b..32db5e666 100644 --- a/Makefile.sources +++ b/Makefile.sources @@ -29,13 +29,8 @@ S_DESKTOP := cookies.c history_global_core.c hotlist.c knockout.c \ scrollbar.c sslcert.c textarea.c thumbnail.c tree.c \ tree_url_node.c version.c -# Javascript sources -ifeq ($(NETSURF_USE_JS),YES) -S_JSAPI = window.c navigator.c console.c htmldocument.c htmlelement.c -S_JAVASCRIPT += content.c jsapi.c $(addprefix jsapi/,$(S_JSAPI)) -else -S_JAVASCRIPT += none.c -endif +# Javascript source +include Makefile.sources.javascript # S_COMMON are sources common to all builds S_COMMON := $(addprefix content/,$(S_CONTENT)) \ @@ -45,7 +40,8 @@ S_COMMON := $(addprefix content/,$(S_CONTENT)) \ $(addprefix utils/,$(S_UTILS)) \ $(addprefix utils/http/,$(S_HTTP)) \ $(addprefix desktop/,$(S_DESKTOP)) \ - $(addprefix javascript/,$(S_JAVASCRIPT)) + $(addprefix javascript/,$(S_JAVASCRIPT)) \ + $(S_JSAPI_BINDING) # S_IMAGE are sources related to image management S_IMAGE_YES := image.c image_cache.c |