Paweł Wieczorek avatar Paweł Wieczorek committed 8dfa806

demo has own build-system

Comments (0)

Files changed (6)

 _build
-Demo.byte
-Demo.native
+demo/_build
+demo/Demo.native
-OCAMLBUILD= ocamlbuild
+OCAMLBUILD= ocamlbuild 
 OCAMLFIND = ocamlfind
 
 SOURCE_DIRS=\
 	${LIBS}\
 	_build/src/StringPainter.a
 
-DEMO=demo/Demo.native
+.PHONY : ${LIBS} demo
 
-.PHONY : ${LIBS}
-
-all: ${LIBS}
+all: demo
 
 install: ${LIBS}
 	${OCAMLFIND} install stringpainter META ${LIB_FILES}
 ${LIBS}:
 	${OCAMLBUILD} ${SOURCE_DIRS} ${LIBS_}
 
-${DEMO}:
-	${OCAMLBUILD} ${DEMO_DIRS} ${SOURCE_DIRS} ${DEMO}
+demo: ${LIBS}
+	cd demo; ${MAKE} all
 
 clean:
-	${OCAMLBUILD} ${DEMO_DIRS} ${SOURCE_DIRS} ${DEMO} -clean
+	${OCAMLBUILD} ${SOURCE_DIRS} ${LIBS_} -clean
+	cd demo; ${MAKE} clean
 
 <src/*.cmx>: for-pack(StringPainter)
+<demo/*.*>: package(stringpainter)
 
 end
 
+
+let _ = print_endline "ArithmeticExpressions"
+
+let _ = ArithmeticExpressions.test ()
+
+let _ = print_endline "Lambda"
+
 let _ = Lambda.test ()
+OCAMLBUILD= ocamlbuild 
+
+DEMO=Demo.native
+
+.PHONY : ${DEMO}
+
+all: ${DEMO}
+
+${DEMO}: ${LIBS}
+	${OCAMLBUILD} -use-ocamlfind ${DEMO_DIRS} ${DEMO}
+
+clean:
+	${OCAMLBUILD} ${DEMO_DIRS} ${SOURCE_DIRS} ${DEMO} -clean
+
+<*.*>: package(stringpainter)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.