Makefile in ParseTree-1.3.7 vs Makefile in ParseTree-1.4.0

@@ -1,41 +1,57 @@
 RUBY?=ruby
 RUBY_DEBUG?=
 RUBY_FLAGS?=-w -Ilib:bin:../../RubyInline/dev
 RUBY_LIB?=$(shell $(RUBY) -rrbconfig -e 'include Config; print CONFIG["sitelibdir"]')
 PREFIX?=/usr/local
+FILTER?=
 
+LIB_FILES= \
+	composite_sexp_processor.rb \
+	parse_tree.rb \
+	sexp.rb \
+	sexp_processor.rb \
+	$(END)
+
+TEST_FILES= \
+	test_sexp_processor.rb \
+	$(END)
+
+BIN_FILES= \
+	parse_tree_abc \
+	parse_tree_show \
+	parse_tree_deps \
+	$(END)
+
 all test: FORCE
-	$(RUBY) $(RUBY_DEBUG) $(RUBY_FLAGS) test/test_all.rb
+	$(RUBY) $(RUBY_DEBUG) $(RUBY_FLAGS) test/test_all.rb $(FILTER)
 
 # we only install test_sexp_processor.rb to help make ruby_to_c's
 # subclass tests work.
 
 docs:
 	rdoc -d -I png --main SexpProcessor -x test_\* -x something.rb
 
 install:
-	cp -f lib/parse_tree.rb lib/sexp_processor.rb lib/composite_sexp_processor.rb $(RUBY_LIB)
-	cp -f test/test_sexp_processor.rb $(RUBY_LIB)
-	cp -f bin/parse_tree_show $(PREFIX)/bin
-	cp -f bin/parse_tree_abc  $(PREFIX)/bin
-	chmod 444 $(RUBY_LIB)/parse_tree.rb $(RUBY_LIB)/sexp_processor.rb $(RUBY_LIB)/composite_sexp_processor.rb $(RUBY_LIB)/test_sexp_processor.rb
-	chmod 555 $(PREFIX)/bin/parse_tree_show $(PREFIX)/bin/parse_tree_abc
+	cd lib  && install -m 0444 $(LIB_FILES)  $(RUBY_LIB)
+	cd test && install -m 0444 $(TEST_FILES) $(RUBY_LIB)
+	cd bin  && install -m 0555 $(BIN_FILES)  $(PREFIX)/bin
 
 uninstall:
-	rm -f $(RUBY_LIB)/parse_tree.rb $(RUBY_LIB)/sexp_processor.rb $(RUBY_LIB)/composite_sexp_processor.rb $(RUBY_LIB)/test_sexp_processor.rb
-	rm -f $(PREFIX)/bin/parse_tree_show $(PREFIX)/bin/parse_tree_abc
+	cd $(RUBY_LIB)   && rm -f $(LIB_FILES) $(TEST_FILES)
+	cd $(PREFIX)/bin && rm -f $(BIN_FILES)
 
 audit:
-	ZenTest composite_sexp_processor.rb sexp_processor.rb test_all.rb test_composite_sexp_processor.rb test_sexp_processor.rb
+	ZenTest -I=lib:test $(addprefix lib/,$(LIB_FILES)) test/test_all.rb
+# test_composite_sexp_processor.rb test_sexp_processor.rb
 
 clean:
 	-find . -name \*~ | xargs rm
 	-rm -fr diff diff.txt *.gem doc $$HOME/.ruby_inline
 
 demo:
 	echo 1+1 | $(RUBY) $(RUBY_FLAGS) ./bin/parse_tree_show -f
 
 gem:
-	gem ParseTree.gemspec
+	ruby ParseTree.gemspec
 
 FORCE: