From ac89f7f7854907f8b45b42ef1f447234d5eb1c64 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sun, 18 May 2014 00:59:47 +0100
Subject: [PATCH] Javascript examples tidy up

- Remove empty files
- Improve clean
---
 .gitignore                                 | 11 +++++++----
 Examples/Makefile.in                       |  3 ++-
 Examples/javascript/functor/Makefile       |  2 +-
 Examples/javascript/functor/binding.gyp.in |  2 +-
 Examples/javascript/functor/example.cxx    |  0
 Examples/javascript/pointer/typemaps.i     |  0
 Examples/test-suite/javascript/Makefile.in |  9 +++------
 7 files changed, 14 insertions(+), 13 deletions(-)
 delete mode 100644 Examples/javascript/functor/example.cxx
 delete mode 100644 Examples/javascript/pointer/typemaps.i

diff --git a/.gitignore b/.gitignore
index efb6cf096..c7961efd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,16 +124,19 @@ Examples/test-suite/uffi/*/
 *_wrap.c
 *_wrap.cxx
 
+# C# generated files
+*_runme.exe.mdb
+*_runme.exe
+
+# Javascript generated files
+*.gyp
+
 # Python generated files, based on:
 #   https://github.com/github/gitignore/blob/master/Python.gitignore
 *.py[cod]
 */__pycache__/
 /__pycache__/
 
-# C# generated files
-*_runme.exe.mdb
-*_runme.exe
-
 # Scratch directories
 Examples/scratch
 
diff --git a/Examples/Makefile.in b/Examples/Makefile.in
index 954a41c07..b22fd2e76 100644
--- a/Examples/Makefile.in
+++ b/Examples/Makefile.in
@@ -730,7 +730,8 @@ javascript_clean:
 	rm -f *_wrap* $(RUNME)
 	rm -f core @EXTRA_CLEAN@
 	rm -f *.@OBJEXT@ *@JSSO@ *.$(SO)
-	(cd $(ROOT_DIR)/Tools/javascript && $(MAKE) -s clean)
+	rm -f binding.gyp
+	cd $(ROOT_DIR)/Tools/javascript && $(MAKE) -s clean
 
 ##################################################################
 #####                       ANDROID                         ######
diff --git a/Examples/javascript/functor/Makefile b/Examples/javascript/functor/Makefile
index 54a8f7b03..0402f8d09 100644
--- a/Examples/javascript/functor/Makefile
+++ b/Examples/javascript/functor/Makefile
@@ -1,3 +1,3 @@
-SRCS = example.cxx
+SRCS =
 
 include $(SRCDIR)../example.mk
diff --git a/Examples/javascript/functor/binding.gyp.in b/Examples/javascript/functor/binding.gyp.in
index c56a650e9..59779aef4 100644
--- a/Examples/javascript/functor/binding.gyp.in
+++ b/Examples/javascript/functor/binding.gyp.in
@@ -2,7 +2,7 @@
   "targets": [
     {
       "target_name": "example",
-      "sources": [ "$srcdir/example.cxx", "example_wrap.cxx" ],
+      "sources": [ "example_wrap.cxx" ],
       "include_dirs": ["$srcdir"]
     }
   ]
diff --git a/Examples/javascript/functor/example.cxx b/Examples/javascript/functor/example.cxx
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Examples/javascript/pointer/typemaps.i b/Examples/javascript/pointer/typemaps.i
deleted file mode 100644
index e69de29bb..000000000
diff --git a/Examples/test-suite/javascript/Makefile.in b/Examples/test-suite/javascript/Makefile.in
index 87e4c6ecb..fc5255155 100644
--- a/Examples/test-suite/javascript/Makefile.in
+++ b/Examples/test-suite/javascript/Makefile.in
@@ -116,9 +116,6 @@ endif
 
 %.clean:
 	rm -rf $*
-
-clean:
-	rm -f *_wrap.cxx
-	rm -f *_wrap.c
-	rm -f *.so
-	rm -f *.o
+	rm -f $*_wrap.*
+	rm -f $*.so
+	rm -f $*.o