diff options
author | Vincent Sanders <vince@kyllikki.org> | 2016-06-07 16:01:04 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2016-06-07 16:01:04 +0100 |
commit | 042fcb82b83d19bf08afd3367235ac71a60b3850 (patch) | |
tree | 47fe3c15f160b3fac7b0e8ab4f47b495901e0557 /Makefile | |
parent | 9754539e2275e33af34b5de9d343b85e8122d871 (diff) | |
download | netsurf-042fcb82b83d19bf08afd3367235ac71a60b3850.tar.gz netsurf-042fcb82b83d19bf08afd3367235ac71a60b3850.tar.bz2 |
Move javascript content handler as appropriate for updated source format
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -596,16 +596,10 @@ include utils/http/Makefile # Desktop sources include desktop/Makefile -# Javascript source -include javascript/Makefile - # S_COMMON are sources common to all builds -S_COMMON := $(S_CONTENT) $(S_FETCHERS) $(S_CSS) $(S_RENDER) $(S_UTILS) \ - $(S_HTTP) $(S_DESKTOP) $(S_JAVASCRIPT) - +S_COMMON := $(S_CONTENT) $(S_FETCHERS) $(S_RENDER) $(S_UTILS) $(S_HTTP) \ + $(S_DESKTOP) $(S_JAVASCRIPT_BINDING) -# Include directory flags -IFLAGS = $(addprefix -I,$(INCLUDE_DIRS)) # ---------------------------------------------------------------------------- # Message targets @@ -630,7 +624,7 @@ MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages endef -# geenrate the message file rules +# generate the message file rules $(eval $(foreach LANG,$(MESSAGES_LANGUAGES), \ $(call split_messages,$(LANG)))) @@ -653,6 +647,9 @@ endif OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(patsubst %.m,%.o,$(patsubst %.s,%.o,$(SOURCES)))))))) +# Include directory flags +IFLAGS = $(addprefix -I,$(INCLUDE_DIRS)) + $(EXETARGET): $(OBJECTS) $(RESOURCES) $(MESSAGES) $(VQ)echo " LINK: $(EXETARGET)" ifneq ($(TARGET)$(SUBTARGET),riscos-elf) |