Permalink
Browse files

Add src rules to makefiles and clean up errors.

  • Loading branch information...
1 parent a1bff9b commit b3f27eaad1a735a625953e2b491835d9a6400d1a @bjc bjc committed Mar 6, 2009
Showing with 11 additions and 13 deletions.
  1. +3 −7 Makefile
  2. +3 −0 frameworks/Makefile
  3. +5 −1 src/Makefile
  4. +0 −5 test/Makefile
View
@@ -1,18 +1,18 @@
SHELL = /bin/sh
-.PHONY: frameworks src test doc clean-src clean-test clean-doc
+.PHONY: frameworks src test doc clean-src clean-doc
all: src doc
-clean: clean-src clean-test clean-doc
+clean: clean-src clean-doc
frameworks:
@echo "--> $(MAKE) $(MFLAGS) $@"
@($(MAKE) -C frameworks all)
src:
@echo "--> $(MAKE) $(MFLAGS) $@"
- @($(MAKE) -C src all)
+ @($(MAKE) -C src src)
test: frameworks
@echo "--> $(MAKE) $(MFLAGS) $@"
@@ -26,10 +26,6 @@ clean-src:
@echo "--> $(MAKE) $(MFLAGS) $@"
@($(MAKE) -C src clean)
-clean-test:
- @echo "--> $(MAKE) $(MFLAGS) $@"
- @($(MAKE) -C test clean)
-
clean-doc:
@echo "--> $(MAKE) $(MFLAGS) $@"
@($(MAKE) -C src clean-doc)
View
@@ -6,3 +6,6 @@ all: rhinodom
rhinodom:
cd rhinodom && ant -Drhino.dir=$(RHINODIR) dist
+
+clean:
+ cd rhinodom && ant -Drhino.dir=$(RHINODIR) clean
View
@@ -8,7 +8,11 @@ TEMPLATE = $(JSDOCDIR)/templates/jsdoc
JAVA = java
-all: ox.js $(DOCDIR)/index.html
+all: src doc
+
+src: ox.js
+
+doc: $(DOCDIR)/index.html
ox.js: Makefile $(SRC)
cat $(SRC) > $@
View
@@ -3,10 +3,5 @@ RHINODOMDIR = ../frameworks/rhinodom
JAVA = java
RHINODIR = $(HOME)/src/rhino1_7R1/build
-.PHONY: rhinodom test
-
test:
$(JAVA) -cp $(RHINODIR)/classes:$(RHINODOMDIR)/build Shell rhino.js
-
-clean:
- cd rhinodom && ant -Drhino.dir=$(RHINODIR) clean

0 comments on commit b3f27ea

Please sign in to comment.