[MPlayer-DOCS] CVS: main/DOCS/xml Makefile, 1.16, 1.17 Makefile.inc, 1.13, 1.14
Diego Biurrun CVS
diego at mplayerhq.hu
Sat Jan 24 23:31:13 CET 2004
Update of /cvsroot/mplayer/main/DOCS/xml
In directory mail:/tmp/cvs-serv27168
Modified Files:
Makefile Makefile.inc
Log Message:
Make the build system print everything it does.
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile 20 Jan 2004 23:31:14 -0000 1.16
+++ Makefile 24 Jan 2004 22:31:11 -0000 1.17
@@ -26,8 +26,8 @@
.PHONY: html-chunked
html-chunked: xsltproc.sh xmllint.sh
- @test -d $(HTML_CHUNKED) || mkdir $(HTML_CHUNKED)
- @for dir in $(SUBDIRS); do\
+ test -d $(HTML_CHUNKED) || mkdir $(HTML_CHUNKED)
+ for dir in $(SUBDIRS); do\
test -f $$dir/Makefile &&\
(test -d $(HTML_CHUNKED)/$$dir || mkdir $(HTML_CHUNKED)/$$dir) &&\
if $(MAKE) HTMLDIR=../$(HTML_CHUNKED)/$$dir -C $$dir html-chunked; then :; else exit 1; fi;\
@@ -35,8 +35,8 @@
.PHONY: html-single
html-single: xsltproc.sh xmllint.sh
- @test -d $(HTML_SINGLE) || mkdir $(HTML_SINGLE)
- @for dir in $(SUBDIRS); do\
+ test -d $(HTML_SINGLE) || mkdir $(HTML_SINGLE)
+ for dir in $(SUBDIRS); do\
test -f $$dir/Makefile &&\
(test -d $(HTML_SINGLE)/$$dir || mkdir $(HTML_SINGLE)/$$dir) &&\
if $(MAKE) HTMLFILE=../$(HTML_SINGLE)/$$dir/MPlayer.html -C $$dir html-single; then :; else exit 1; fi;\
@@ -44,21 +44,21 @@
.PHONY: clean-html-chunked
clean-html-chunked:
- @-rm -rf $(HTML_CHUNKED)
+ -rm -rf $(HTML_CHUNKED)
.PHONY: clean-html-single
clean-html-single:
- @-rm -rf $(HTML_SINGLE)
+ -rm -rf $(HTML_SINGLE)
.PHONY: distclean
distclean: clean-html-chunked clean-html-single
- @for dir in $(SUBDIRS); do\
+ for dir in $(SUBDIRS); do\
test -f $$dir/Makefile &&\
if $(MAKE) HTMLDIR=../$(HTML_CHUNKED)/$$dir -C $$dir distclean ; then :; else exit 1; fi;\
done
- @-rm -f html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh
+ -rm -f html-chunk.xsl html-single.xsl xsltproc.sh xmllint.sh
xsltproc.sh xmllint.sh:
- @sh configure
+ sh configure
clean: clean-html-chunked clean-html-single
Index: Makefile.inc
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/Makefile.inc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.inc 20 Jan 2004 23:27:24 -0000 1.13
+++ Makefile.inc 24 Jan 2004 22:31:11 -0000 1.14
@@ -37,48 +37,48 @@
html-single: $(HTMLFILE)
$(HTMLDIR)/index.html: main.xml $(CHUNK_XSL_DEPS)
- @if test "$(HTMLDIR)" = "" ; then \
+ if test "$(HTMLDIR)" = "" ; then \
echo "Error: HTMLDIR not set!!!"; \
echo "Typically this means, that you've run make from a subdir of DOCS/xml."; \
echo "Don't do this!"; \
false; \
fi
- @if test "$(USE_SYMLINKS)" = "yes" ; then \
+ if test "$(USE_SYMLINKS)" = "yes" ; then \
for file in ../en/*.xml ; do \
if ! test -r `basename $$file` ; then \
ln -s $$file `basename $$file` ; \
fi ; \
done ; \
fi
- @-rm -f $(HTMLDIR)/*
- @../xmllint.sh $<
- @cp -f $(HTML_STYLESHEET) $(HTMLDIR)/
- @../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $<
+ -rm -f $(HTMLDIR)/*
+ ../xmllint.sh $<
+ cp -f $(HTML_STYLESHEET) $(HTMLDIR)/
+ ../xsltproc.sh $(HTMLDIR)/ $(HTML_CHUNK_XSL) $<
$(HTMLFILE): main.xml $(XSL_DEPS)
- @if test "$(HTMLFILE)" = "" ; then \
+ if test "$(HTMLFILE)" = "" ; then \
echo "Error: HTMLFILE not set!!!"; \
echo "Typically this means, that you've run make from a subdir of DOCS/xml."; \
echo "Don't do this!"; \
false; \
fi
- @if test "$(USE_SYMLINKS)" = "yes" ; then \
+ if test "$(USE_SYMLINKS)" = "yes" ; then \
for file in ../en/*.xml ; do \
if ! test -r `basename $$file` ; then \
ln -s $$file `basename $$file` ; \
fi ; \
done ; \
fi
- @-rm -f $(HTMLFILE)
- @../xmllint.sh $<
- @cp -f $(HTML_STYLESHEET) `dirname $(HTMLFILE)`
- @../xsltproc.sh $(HTMLFILE) $(HTML_SINGLE_XSL) $<
+ -rm -f $(HTMLFILE)
+ ../xmllint.sh $<
+ cp -f $(HTML_STYLESHEET) `dirname $(HTMLFILE)`
+ ../xsltproc.sh $(HTMLFILE) $(HTML_SINGLE_XSL) $<
../html-chunk.xsl ../html-single.xsl main.xml:
cd .. && sh configure
distclean:
- @rm -f main.xml
- @if test "$(USE_SYMLINKS)" = "yes" ; then \
+ rm -f main.xml
+ if test "$(USE_SYMLINKS)" = "yes" ; then \
rm -f `find *.xml -type l`; \
fi
More information about the MPlayer-DOCS
mailing list