Correction of bugs and new functionalities.

[mapping.git] / Makefile

diff --git a/Makefile b/Makefile
index 3714bb6..292a7c7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@
 
 JAVAC=javac
 BIN=bin
 
 JAVAC=javac
 BIN=bin

-#LIB=lib

 SRC=src
 PACK=and
 PACKAGE=$(PACK)/Mapping
 SRC=src
 PACK=and
 PACKAGE=$(PACK)/Mapping


@@ -13,27 +12,40 @@ JAR=Mapping.jar
 EXT=com/
 JAVADOC=javadoc
 
 EXT=com/
 JAVADOC=javadoc
 

-compile:clean
+compile:

        @echo
        @echo

-       @echo "Compilation of Mapping library ..."
+       @echo "## Compilation of Mapping library ..."

        @echo
        @echo

-       mkdir $(BIN)

        $(JAVAC) -d ./$(BIN) ./$(SRC)/$(PACKAGE)/*.java
 
 
        $(JAVAC) -d ./$(BIN) ./$(SRC)/$(PACKAGE)/*.java
 
 

-jar:compile
+jar:clean compile

        @echo
        @echo

-       @echo "Creation of Mapping jar ..."
+       @echo "## Creation of Mapping jar ..."

        @echo
        @echo

-       jar -cvfm $(JAR) Manifest $(EXT) $(JAVADOC) -C $(BIN) $(PACK)/ #$(LIB)  
+       jar -cvfm ./$(JAR) Manifest ./$(EXT) ./$(JAVADOC) -C ./$(BIN) ./$(PACK)/
+
+
+javadoc:cleanDoc
+       @echo
+       @echo "## Generating Javadoc ..."
+       @echo 
+       javadoc -d ./$(JAVADOC) ./$(SRC)/$(PACKAGE)/*.java
+

 
 clean:
        @echo
 
 clean:
        @echo

-       @echo "Cleaning project ..."
+       @echo "## Cleaning project ..."

        @echo
        @echo

-       rm -rf bin $(JAR)
+       rm -rf ./$(BIN)/* ./$(JAR)

 
 
 
 

+cleanDoc:
+       @echo
+       @echo "## Cleaning Javadoc ..."
+       @echo
+       rm -rf ./$(JAVADOC)/*
+

 #
 ##
 #
 #
 ##
 #