X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/mapping.git/blobdiff_plain/919cd5f7e473b8b22b46a6b6c221341ca8cd738b..c5259b6a754655006e41cae8ff32292b7eee4913:/Makefile?ds=sidebyside

diff --git a/Makefile b/Makefile
index 80e8513..292a7c7 100644
--- a/Makefile
+++ b/Makefile
@@ -5,33 +5,46 @@
 
 JAVAC=javac
 BIN=bin
-LIB=lib
 SRC=src
 PACK=and
 PACKAGE=$(PACK)/Mapping
 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) -cp .:./$(LIB)/* -d ./$(BIN) ./$(SRC)/$(PACKAGE)/*.java
+	$(JAVAC) -d ./$(BIN) ./$(SRC)/$(PACKAGE)/*.java
 
 
-jar:compile
+jar:clean compile
+	@echo
+	@echo "## Creation of Mapping jar ..."
 	@echo
-	@echo "Creation of Mapping jar ..."
+	jar -cvfm ./$(JAR) Manifest ./$(EXT) ./$(JAVADOC) -C ./$(BIN) ./$(PACK)/
+
+
+javadoc:cleanDoc
 	@echo
-	jar -cvfm $(JAR) Manifest -C $(BIN) $(PACK)/ $(LIB)
+	@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)/*
 
 #
 ##