Update the java codegen makefile for having the two libs in-tree and change a few target names so they aren't obnoxious

1 files changed, 6 insertions, 24 deletions

diff --git a/parser/html/java/Makefile b/parser/html/java/Makefile
index b43523e03d..056fbe36c8 100644
--- a/parser/html/java/Makefile
+++ b/parser/html/java/Makefile
@@ -11,49 +11,31 @@ translator:: javaparser \
   jar cfm translator.jar manifest.txt -C htmlparser/bin .
 
 javaparser:: \
-; mkdir -p javaparser/bin && \
-  find javaparser/src -name "*.java" | \
+; mkdir -p javaparser/bin && find javaparser/src -name "*.java" | \
     xargs javac -encoding ISO-8859-1 -g -d javaparser/bin && \
   jar cf javaparser.jar -C javaparser/bin .
 
-sync_javaparser:: \
-; if [ ! -d javaparser/.git ] ; \
-    then rm -rf javaparser ; \
-    git clone https://github.com/javaparser/javaparser.git ; \
-  fi ; \
-  cd javaparser ; git checkout javaparser-1.0.6 ; cd .. 
-
-sync_htmlparser:: \
-; if [ -d htmlparser/.hg ] ; \
-  then cd htmlparser ; hg pull --rebase ; cd .. ; \
-  else \
-    rm -rf htmlparser ; \
-    hg clone https://hg.mozilla.org/projects/htmlparser ; \
-  fi
-
-sync:: sync_javaparser sync_htmlparser
-
 translate:: translator \
 ; mkdir -p ../javasrc ; \
   java -jar translator.jar \
     htmlparser/src/nu/validator/htmlparser/impl \
     .. ../nsHtml5AtomList.h
 
-translate_from_snapshot:: translator \
+translate-javasrc:: translator \
 ; mkdir -p ../javasrc ; \
   java -jar translator.jar \
     ../javasrc \
     .. ../nsHtml5AtomList.h
 
-named_characters:: translator \
+named-characters:: translator \
 ; java -cp translator.jar \
     nu.validator.htmlparser.generator.GenerateNamedCharactersCpp \
       named-character-references.html ../
 
-clean_javaparser:: \
+clean-javaparser:: \
 ; rm -rf javaparser/bin javaparser.jar
 
-clean_htmlparser:: \
+clean-htmlparser:: \
 ; rm -rf htmlparser/bin translator.jar
 
-clean:: clean_javaparser clean_htmlparser
+clean:: clean-javaparser clean-htmlparser