New version of MAHEVE plus corrections.

[mapping.git] / Makefile

diff --git a/Makefile b/Makefile
index 3714bb6..578d223 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@
 
 JAVAC=javac
 BIN=bin
-#LIB=lib
 SRC=src
 PACK=and
 PACKAGE=$(PACK)/Mapping
@@ -13,26 +12,40 @@ JAR=Mapping.jar
 EXT=com/
 JAVADOC=javadoc
 
-compile:clean
+
+jar:clean compile
        @echo
-       @echo "Compilation of Mapping library ..."
+       @echo "## Creation of Mapping jar ..."
        @echo
-       mkdir $(BIN)
-       $(JAVAC) -d ./$(BIN) ./$(SRC)/$(PACKAGE)/*.java
+       jar -cvfm ./$(JAR) Manifest ./$(EXT) -C ./$(BIN) ./$(PACK)/
 
 
-jar:compile
+compile:
+       @echo
+       @echo "## Compilation of Mapping library ..."
        @echo
-       @echo "Creation of Mapping jar ..."
+       $(JAVAC) -d ./$(BIN) ./$(SRC)/$(PACKAGE)/*.java
+
+
+javadoc:cleanDoc
        @echo
-       jar -cvfm $(JAR) Manifest $(EXT) $(JAVADOC) -C $(BIN) $(PACK)/ #$(LIB)  
+       @echo "## Generating Javadoc ..."
+       @echo 
+       javadoc -windowtitle "Mapping Library" -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)/*
 
 #
 ##