diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2014-12-28 16:13:22 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2014-12-28 16:13:22 +0000 |
| commit | 2b04d37b9425d2724b41ebbc1e1ca96a3ac6e74e (patch) | |
| tree | 5688d806c226419b142cff5ced113dfbc8c1d576 /Examples | |
| parent | d79f11501d0bdd78a038df79521ce21bf7cd9825 (diff) | |
| download | swig-2b04d37b9425d2724b41ebbc1e1ca96a3ac6e74e.tar.gz | |
Tidy up Javascript build system
Diffstat (limited to 'Examples')
| -rw-r--r-- | Examples/Makefile.in | 5 | ||||
| -rw-r--r-- | Examples/test-suite/javascript/Makefile.in | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Examples/Makefile.in b/Examples/Makefile.in index bd3ed6c90..cdc33d030 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -633,9 +633,6 @@ java_clean: ROOT_DIR = @ROOT_DIR@ JSINCLUDES = @JSCOREINC@ @JSV8INC@ JSDYNAMICLINKING = @JSCOREDYNAMICLINKING@ @JSV8DYNAMICLINKING@ -JSSO =@JSSO@ -JSLDSHARED = @JSLDSHARED@ -JSCXXSHARED = @JSCXXSHARED@ NODEJS = @NODEJS@ NODEGYP = @NODEGYP@ @@ -731,7 +728,7 @@ javascript_clean: rm -rf build rm -f *_wrap* $(RUNME) rm -f core @EXTRA_CLEAN@ - rm -f *.@OBJEXT@ *@JSSO@ *.$(SO) + rm -f *.@OBJEXT@ *@SO@ rm -f binding.gyp example-gypcopy.cxx cd $(ROOT_DIR)/Tools/javascript && $(MAKE) -s clean diff --git a/Examples/test-suite/javascript/Makefile.in b/Examples/test-suite/javascript/Makefile.in index b0fd82c25..3a15e5af1 100644 --- a/Examples/test-suite/javascript/Makefile.in +++ b/Examples/test-suite/javascript/Makefile.in @@ -6,6 +6,8 @@ LANGUAGE = javascript NODEGYP = @NODEGYP@ NODEJS = @NODEJS@ SCRIPTSUFFIX = _runme.js +OBJ = @OBJ@ +SO = @SO@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -116,10 +118,10 @@ endif %.clean: @rm -rf $* - @rm -f $*_wrap.* $*.so $*.o + @rm -f $*_wrap.* $*$(SO) $*$(OBJ) 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 imports_a$${ext} imports_b$${ext}; \ rm -f import_stl_a$${ext} import_stl_b$${ext}; \ |