From 042fcb82b83d19bf08afd3367235ac71a60b3850 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 7 Jun 2016 16:01:04 +0100 Subject: Move javascript content handler as appropriate for updated source format --- Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6b190074e..226bf4f3d 100644 --- a/Makefile +++ b/Makefile @@ -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) -- cgit v1.2.3