From 296a5d028547c0a0a013a24e65cdcb9c3086fb52 Mon Sep 17 00:00:00 2001 From: Oliver Buchtala Date: Sat, 8 Sep 2012 01:14:48 +0000 Subject: [PATCH] Minor change in javascript example Makefile configuration. Propagate global CFLAGS and CXXFLAGS to inner javascript targets. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/oliverb-javascript-v8@13823 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/Makefile.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Examples/Makefile.in b/Examples/Makefile.in index a6ed5157e..bf9fe5cd8 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -543,8 +543,7 @@ JSCFLAGS = @JSCORECFLAGS@ JSCXXFLAGS = @JSCXXFLAGS@ JSEXE_SRC_DIR = $(TOP)/../Tools/javascript -JSEXE_SRC = $(JSEXE_SRC_DIR)/javascript.cxx $(JSEXE_SRC_DIR)/js_shell.cxx -JSEXE = $(TOP)/../Tools/javascript/javascript +JSEXE = $(JSEXE_SRC_DIR)/javascript ifeq (,$(V8)) JSEXE_SRC = $(JSEXE_SRC_DIR)/javascript.cxx $(JSEXE_SRC_DIR)/js_shell.cxx $(JSEXE_SRC_DIR)/jsc_shell.cxx JSEXE_OPTS = -jsc @@ -563,8 +562,8 @@ endif ifeq (,$(V8)) javascript: $(SRCS) $(SWIGJS) $(SWIGOPT) $(INTERFACEPATH) - $(CC) -c $(CCSHARED) $(JSCFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(JS_INCLUDE) - $(JSLDSHARED) $(CCSHARED) $(JSCFLAGS) $(OBJS) $(IOBJS) $(JS_DLNK) $(LIBS) -o $(JS_LIBPREFIX)$(TARGET)$(JSSO) + $(CC) -c $(CCSHARED) $(CFLAGS) $(JSCFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(JS_INCLUDE) + $(JSLDSHARED) $(CCSHARED) $(OBJS) $(IOBJS) $(JS_DLNK) $(LIBS) -o $(JS_LIBPREFIX)$(TARGET)$(JSSO) else javascript: $(SRCS) javascript_cpp endif @@ -575,7 +574,7 @@ endif javascript_cpp: $(SRCS) $(SWIGJS) -c++ $(SWIGOPT) $(INTERFACEPATH) - $(CXX) -c $(CCSHARED) $(JSCXXFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JS_INCLUDE) + $(CXX) -c $(CCSHARED) $(CXXFLAGS) $(JSCXXFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JS_INCLUDE) $(JSCXXSHARED) $(CCSHARED) $(OBJS) $(IOBJS) $(JS_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JS_LIBPREFIX)$(TARGET)$(JSSO) # ----------------------------------------------------------------