jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tidy up Javascript build system

Browse source
This commit is contained in:
William S Fulton 2014-12-28 16:13:22 +00:00
commit 2b04d37b94
4 changed files with 5 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Examples/Makefile.in
View file

@ -633,9 +633,6 @@ java_clean:
ROOT_DIR = @ROOT_DIR@ ROOT_DIR = @ROOT_DIR@
JSINCLUDES = @JSCOREINC@ @JSV8INC@ JSINCLUDES = @JSCOREINC@ @JSV8INC@
JSDYNAMICLINKING = @JSCOREDYNAMICLINKING@ @JSV8DYNAMICLINKING@ JSDYNAMICLINKING = @JSCOREDYNAMICLINKING@ @JSV8DYNAMICLINKING@
JSSO =@JSSO@
JSLDSHARED = @JSLDSHARED@
JSCXXSHARED = @JSCXXSHARED@
NODEJS = @NODEJS@ NODEJS = @NODEJS@
NODEGYP = @NODEGYP@ NODEGYP = @NODEGYP@
@ -731,7 +728,7 @@ javascript_clean:
rm -rf build rm -rf build
rm -f *_wrap* $(RUNME) rm -f *_wrap* $(RUNME)
rm -f core @EXTRA_CLEAN@ rm -f core @EXTRA_CLEAN@
rm -f *.@OBJEXT@ *@JSSO@ *.$(SO) rm -f *.@OBJEXT@ *@SO@
rm -f binding.gyp example-gypcopy.cxx rm -f binding.gyp example-gypcopy.cxx
cd $(ROOT_DIR)/Tools/javascript && $(MAKE) -s clean cd $(ROOT_DIR)/Tools/javascript && $(MAKE) -s clean

6
Examples/test-suite/javascript/Makefile.in
View file

@ -6,6 +6,8 @@ LANGUAGE = javascript
NODEGYP = @NODEGYP@ NODEGYP = @NODEGYP@
NODEJS = @NODEJS@ NODEJS = @NODEJS@
SCRIPTSUFFIX = _runme.js SCRIPTSUFFIX = _runme.js
OBJ = @OBJ@
SO = @SO@
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
@ -116,10 +118,10 @@ endif
%.clean: %.clean:
@rm -rf $* @rm -rf $*
@rm -f $*_wrap.* $*.so $*.o @rm -f $*_wrap.* $*$(SO) $*$(OBJ)
clean: clean:
for ext in _wrap.cxx _wrap.o .so; do \ for ext in _wrap.cxx _wrap$(OBJ) $(SO); do \
rm -f clientdata_prop_a$${ext} clientdata_prop_b$${ext}; \ rm -f clientdata_prop_a$${ext} clientdata_prop_b$${ext}; \
rm -f imports_a$${ext} imports_b$${ext}; \ rm -f imports_a$${ext} imports_b$${ext}; \
rm -f import_stl_a$${ext} import_stl_b$${ext}; \ rm -f import_stl_a$${ext} import_stl_b$${ext}; \

4
Tools/javascript/Makefile.in
View file

@ -26,10 +26,6 @@ LINKFLAGS = @JSINTERPRETERLINKFLAGS@
ROOT_DIR = @ROOT_DIR@ ROOT_DIR = @ROOT_DIR@
JSINCLUDES = @JSCOREINC@ @JSV8INC@ JSINCLUDES = @JSCOREINC@ @JSV8INC@
JSDYNAMICLINKING = @JSCOREDYNAMICLINKING@ @JSV8DYNAMICLINKING@ JSDYNAMICLINKING = @JSCOREDYNAMICLINKING@ @JSV8DYNAMICLINKING@
JSLIBRARYPREFIX = @JSLIBRARYPREFIX@
JSSO =@JSSO@
JSLDSHARED = @JSLDSHARED@
JSCXXSHARED = @JSCXXSHARED@
JSV8ENABLED = @JSV8ENABLED@ JSV8ENABLED = @JSV8ENABLED@
JSCENABLED = @JSCENABLED@ JSCENABLED = @JSCENABLED@

18
configure.ac
View file

@ -1123,28 +1123,15 @@ else
# General Javascript settings shared by JSC and V8 # General Javascript settings shared by JSC and V8
#---------------------------------------------------------------- #----------------------------------------------------------------
case $host in
*-*-cygwin* | *-*-mingw*)
JSLIBRARYPREFIX=""
;;
*)
JSLIBRARYPREFIX="lib"
;;
esac
case $host in case $host in
*-*-darwin*) *-*-darwin*)
JSSO=".dylib" JSSO=".dylib"
JSLDSHARED='$(CC) -dynamiclib'
JSCXXSHARED='$(CXX) -dynamiclib'
# HACK: didn't manage to get dynamic module loading working with a g++ compiled interpreter # HACK: didn't manage to get dynamic module loading working with a g++ compiled interpreter
JSINTERPRETERCXX='c++' JSINTERPRETERCXX='c++'
JSINTERPRETERLINKFLAGS='-g -Wl,-search_paths_first -Wl,-headerpad_max_install_names' JSINTERPRETERLINKFLAGS='-g -Wl,-search_paths_first -Wl,-headerpad_max_install_names'
;; ;;
*) *)
JSSO=$SO JSSO=$SO
JSLDSHARED='$(LDSHARED)'
JSCXXSHARED='$(CXXSHARED)'
JSINTERPRETERCXX='$(CXX)' JSINTERPRETERCXX='$(CXX)'
JSINTERPRETERLINKFLAGS='-ldl' JSINTERPRETERLINKFLAGS='-ldl'
;; ;;
@ -1296,11 +1283,6 @@ else
fi fi
AC_SUBST(JSLIBRARYPREFIX)
AC_SUBST(JSSO)
AC_SUBST(JSLDSHARED)
AC_SUBST(JSCXXSHARED)
AC_SUBST(JSINTERPRETERCXX) AC_SUBST(JSINTERPRETERCXX)
AC_SUBST(JSINTERPRETERLINKFLAGS) AC_SUBST(JSINTERPRETERLINKFLAGS)