From f36a85695c9c5569977ae614fc34a26fb20016a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Thu, 7 Apr 2005 21:01:46 +0000 Subject: [PATCH] reordering of dependencies (i.e. make release) documentation is now generated in root dir, no more in mrw subdir --- makefile.am | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/makefile.am b/makefile.am index 07dff51..f88fab8 100644 --- a/makefile.am +++ b/makefile.am @@ -9,6 +9,10 @@ ## @license LGPL, see file COPYING ## ## $Log$ +## Revision 1.23 2005/04/07 21:01:46 marc +## reordering of dependencies (i.e. make release) +## documentation is now generated in root dir, no more in mrw subdir +## ## Revision 1.22 2005/03/11 23:28:30 marc ## - new multithreaded package ## - new log4cxx package @@ -108,9 +112,9 @@ RPMS = /usr/src/packages/RPMS/i586/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@-1.i586. .PHONY: release tag rpm webserver distclean-local -release: rpm tag webserver +release: all tag rpm webserver -tag: +tag: check distcheck cvs ci -R . cvs tag -FR REL_@PACKAGENAME@-@MAJOR@-@MINOR@-@LEAST@ . @@ -118,11 +122,11 @@ rpm: dist cp @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.tar.gz /usr/src/packages/SOURCES/ rpmbuild -ba --clean @PACKAGENAME@.spec -webserver: check tag all check dist rpm +webserver: dist rpm ssh root@waeckerlin.org bash -c \ '"rm -r /home/marc/mrw-c++; mkdir -p /home/marc/mrw-c++"' - scp mrw/doc/html/* \ - mrw/doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf \ + scp doc/html/* \ + doc/latex/@PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.pdf \ @PACKAGENAME@-@MAJOR@.@MINOR@.@LEAST@.tar.gz \ ${RPMS} \ log4cxx*.rpm \