From b85986beb51b5e1b93858b28e33dee74b40ad7e1 Mon Sep 17 00:00:00 2001 From: Bilou Date: Mon, 16 Jan 2023 16:27:33 +0100 Subject: [PATCH] $ --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5d2c7e3..84a243e 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,18 @@ # COMMANDES JAVA = java JAVAC = javac -JAR = java -jar +JAR = jar cvfe +JAR_OPTIONS = -jar +NOM_JAR = JSonInspector.jar JAVADOC = javadoc -OPTIONSDOCS = -d docs -noqualifier all +OPTIONSDOCS = -d docs -noqualifier all -Xdoclint:none JAVAC_OPTIONS = -d build -Xlint:unchecked EXT = .java # CHEMINS SRC = src/fr/sae/JSonInspector BUILD = build/fr/sae/JSonInspector +PACKAGE = fr.sae.JSonInspector DOCS = docs CORE = Main @@ -26,8 +29,7 @@ run: make clean mkdir build/ && mkdir docs/ ${JAVAC} ${JAVAC_OPTIONS} ${SETTINGS} ${GRAPHICS} ${STORAGE} ${EXCEPTION} ${MAIN} - ${JAR} cvfe JSonInspector.jar fr.sae.JSonInspector.Main -C build fr - cd build && java fr.sae.JSonInspector.Main && cd .. + ${JAR} ${NOM_JAR} ${PACKAGE}.Main -C build fr make docs clean: