Created subdirectories src and examples

mjambon · May 18, 2012 · 96d3367 · 96d3367
1 parent 5836c35
commit 96d3367
Show file tree

Hide file tree

Showing 26 changed files with 40 additions and 62 deletions.
diff --git a/Makefile b/Makefile
@@ -1,29 +1,13 @@
-purple_fringe: purple_fringe.ml
-	ocamlfind ocamlopt -o purple_fringe purple_fringe.ml \
-		-package camlimages -linkpkg
+.PHONY: default
+default:
+	cd src; $(MAKE)
 
 .PHONY: examples
-EXAMPLES = \
-  wikipedia-horsie \
-  butterfly \
-  eye \
-  purple-sky \
-  tree \
-  purple0 \
-  purple1 \
-  purple2 \
-  purple3
-
-EXAMPLES_IN = $(addsuffix .jpg, $(EXAMPLES))
-EXAMPLES_OUT = $(addsuffix -fixed.jpg, $(EXAMPLES))
-
-examples: examples.html
-examples.html: $(EXAMPLES_OUT) Makefile
-	./make-examples.sh $(EXAMPLES)
-
-%-fixed.jpg: %.jpg purple_fringe
-	./purple_fringe $< $@
+examples: default
+	cd examples; $(MAKE)
 
 .PHONY: clean
 clean:
-	rm -f *.cmi *.cmx *.o purple_fringe
+	rm -f *~
+	cd src; $(MAKE) clean
+	cd examples; $(MAKE) clean
diff --git a/examples.html b/examples.html
diff --git a/examples/Makefile b/examples/Makefile
@@ -0,0 +1,26 @@
+.PHONY: examples
+EXAMPLES = \
+  wikipedia-horsie \
+  butterfly \
+  eye \
+  tree \
+  snake \
+  purple-sky \
+  purple0 \
+  purple1 \
+  purple2 \
+  purple3
+
+EXAMPLES_IN = $(addsuffix .jpg, $(EXAMPLES))
+EXAMPLES_OUT = $(addsuffix -fixed.jpg, $(EXAMPLES))
+
+examples: examples.html
+examples.html: $(EXAMPLES_OUT) Makefile
+	./make-examples.sh $(EXAMPLES)
+
+%-fixed.jpg: %.jpg ../src/unpurple
+	../src/unpurple $< $@
+
+.PHONY: clean
+clean:
+	rm -f *~
diff --git a/butterfly-fixed.jpg → examples/butterfly-fixed.jpg b/butterfly-fixed.jpg → examples/butterfly-fixed.jpg
diff --git a/butterfly.jpg → examples/butterfly.jpg b/butterfly.jpg → examples/butterfly.jpg
diff --git a/eye-fixed.jpg → examples/eye-fixed.jpg b/eye-fixed.jpg → examples/eye-fixed.jpg
diff --git a/eye.jpg → examples/eye.jpg b/eye.jpg → examples/eye.jpg
diff --git a/make-examples.sh → examples/make-examples.sh b/make-examples.sh → examples/make-examples.sh
diff --git a/purple-sky-fixed.jpg → examples/purple-sky-fixed.jpg b/purple-sky-fixed.jpg → examples/purple-sky-fixed.jpg
diff --git a/purple-sky.jpg → examples/purple-sky.jpg b/purple-sky.jpg → examples/purple-sky.jpg
diff --git a/purple0-fixed.jpg → examples/purple0-fixed.jpg b/purple0-fixed.jpg → examples/purple0-fixed.jpg
diff --git a/purple0.jpg → examples/purple0.jpg b/purple0.jpg → examples/purple0.jpg
diff --git a/purple1-fixed.jpg → examples/purple1-fixed.jpg b/purple1-fixed.jpg → examples/purple1-fixed.jpg
diff --git a/purple1.jpg → examples/purple1.jpg b/purple1.jpg → examples/purple1.jpg
diff --git a/purple2-fixed.jpg → examples/purple2-fixed.jpg b/purple2-fixed.jpg → examples/purple2-fixed.jpg
diff --git a/purple2.jpg → examples/purple2.jpg b/purple2.jpg → examples/purple2.jpg
diff --git a/purple3-fixed.jpg → examples/purple3-fixed.jpg b/purple3-fixed.jpg → examples/purple3-fixed.jpg
diff --git a/purple3.jpg → examples/purple3.jpg b/purple3.jpg → examples/purple3.jpg
diff --git a/examples/snake-fixed.jpg b/examples/snake-fixed.jpg
diff --git a/examples/snake.jpg b/examples/snake.jpg
diff --git a/tree-fixed.jpg → examples/tree-fixed.jpg b/tree-fixed.jpg → examples/tree-fixed.jpg
diff --git a/tree.jpg → examples/tree.jpg b/tree.jpg → examples/tree.jpg
diff --git a/wikipedia-horsie-fixed.jpg → examples/wikipedia-horsie-fixed.jpg b/wikipedia-horsie-fixed.jpg → examples/wikipedia-horsie-fixed.jpg
diff --git a/wikipedia-horsie.jpg → examples/wikipedia-horsie.jpg b/wikipedia-horsie.jpg → examples/wikipedia-horsie.jpg
diff --git a/src/Makefile b/src/Makefile
@@ -0,0 +1,6 @@
+unpurple: unpurple.ml
+	ocamlfind ocamlopt -o unpurple unpurple.ml \
+		-package camlimages -linkpkg
+.PHONY: clean
+clean:
+	rm -f *~ *.cmi *.cmx *.o unpurple
diff --git a/purple_fringe.ml → src/unpurple.ml b/purple_fringe.ml → src/unpurple.ml