X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/mapping.git/blobdiff_plain/1943cd46cee3f63424e965e9e58f9779a5505cec..732a7291d1f84c7c95026129b8550b84f69337e5:/Makefile

diff --git a/Makefile b/Makefile
index 3714bb6..5e7081a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@
 
 JAVAC=javac
 BIN=bin
-#LIB=lib
 SRC=src
 PACK=and
 PACKAGE=$(PACK)/Mapping
@@ -13,27 +12,40 @@ JAR=Mapping.jar
 EXT=com/
 JAVADOC=javadoc
 
-compile:clean
+compile:
 	@echo
-	@echo "Compilation of Mapping library ..."
+	@echo "## Compilation of Mapping library ..."
 	@echo
-	mkdir $(BIN)
 	$(JAVAC) -d ./$(BIN) ./$(SRC)/$(PACKAGE)/*.java
 
 
-jar:compile
+jar:clean compile
 	@echo
-	@echo "Creation of Mapping jar ..."
+	@echo "## Creation of Mapping jar ..."
 	@echo
-	jar -cvfm $(JAR) Manifest $(EXT) $(JAVADOC) -C $(BIN) $(PACK)/ #$(LIB)  
+	jar -cvfm ./$(JAR) Manifest ./$(EXT) -C ./$(BIN) ./$(PACK)/
+
+
+javadoc:cleanDoc
+	@echo
+	@echo "## Generating Javadoc ..."
+	@echo 
+	javadoc -d ./$(JAVADOC) ./$(SRC)/$(PACKAGE)/*.java
+
 
 clean:
 	@echo
-	@echo "Cleaning project ..."
+	@echo "## Cleaning project ..."
 	@echo
-	rm -rf bin $(JAR)
+	rm -rf ./$(BIN)/* ./$(JAR)
 
 
+cleanDoc:
+	@echo
+	@echo "## Cleaning Javadoc ..."
+	@echo
+	rm -rf ./$(JAVADOC)/*
+
 #
 ##
 #