diff --git a/Makefile b/Makefile index b2ee930..4f357ab 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ # COMMANDES JAVA = java JAVAC = javac +JAR = java -jar JAVADOC = javadoc OPTIONSDOCS = -d docs -noqualifier all JAVAC_OPTIONS = -d build -Xlint:unchecked @@ -9,7 +10,7 @@ EXT = .java # CHEMINS SRC = src/fr/sae/JSonInspector BUILD = build/fr/sae/JSonInspector -DOCS = docs/ +DOCS = docs CORE = Main # CHEMINS RELATIF AU PROJET @@ -25,11 +26,13 @@ run: make clean mkdir build/ && mkdir docs/ ${JAVAC} ${JAVAC_OPTIONS} ${SETTINGS} ${GRAPHICS} ${STORAGE} ${EXCEPTION} ${MAIN} + make docs + ${JAR} cvfe JSonInspector.jar fr.sae.JSonInspector.Main -C build fr cd build && java fr.sae.JSonInspector.Main && cd .. clean: rm -rf build && rm -rf docs docs: - rm -rf ${BUILD}* - ${JAVADOC} ${OPTIONSDOCS} ${ALL} \ No newline at end of file + rm -rf ${DOCS}/* + ${JAVADOC} ${OPTIONSDOCS} ${SETTINGS} ${GRAPHICS} ${STORAGE} ${EXCEPTION} ${MAIN} \ No newline at end of file