Commits

Antoine Pietri committed 04076c1

Makefile: cosmetic fixes

Comments (0)

Files changed (1)

 FILES := AUTHORS ast.mli blaise.ml eval.ml lexer.ml Makefile parser.ml\
 	prettyprint.ml
 
-RENDU := pietri_a-mpoc2012
+LOGIN := pietri_a
+RENDU := ${LOGIN}-mpoc2012
 TARBALL := ${RENDU}.tar.bz2
-
-HTTP_USER := pietri_a
 GROUPE := b2
-WGET := curl -u ${HTTP_USER}\
-	-H "Content-Type: multipart/form-data"\
-	-F "userfile=@${TARBALL};filename=${TARBALL};type=application/x-bzip"\
+CURL := curl --silent --output /dev/null -u ${LOGIN}\
+	-F "userfile=@${TARBALL};filename=${TARBALL}"\
 	-F "GROUPE=${GROUPE}" -F "MAX_FILE_SIZE=2097152" -F "UPLOADED=DONE"
 URL := http://rendu.infoprepa.epita.fr/EPITA2016/index.php?TP=20130107
 
 all: ${FILES}
 	ocamlbuild ${NAME}.native
-	cp ${NAME}.native blaise
+	cp ${NAME}.native ${NAME}
 	${MAKE} clean
 
 blaise: all
 
 rendu: ${FILES}
-	mkdir ${RENDU}
-	for f in ${FILES}; do cp $$f ${RENDU}; done
-	tar -cvjf ${TARBALL} ${RENDU}
-	rm -rf ${RENDU}
+	@echo -n "Making tarball ${TARBALL}… "
+	@mkdir ${RENDU}
+	@for f in ${FILES}; do cp $$f ${RENDU}; done
+	@tar -cjf ${TARBALL} ${RENDU}
+	@rm -rf ${RENDU}
+	@echo "done !"
 
 rendu_upload: rendu
-	file ${TARBALL}
-	${WGET} ${URL}
+	@echo "Sending project to rendu.infoprepa.epita.fr…"
+	@${CURL} ${URL}
+	@echo "Success !"
 
 clean:
 	ocamlbuild -clean