X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=144c06c3ea9eddca13acc2b680b25e5e6e88a662;hb=a6d9810733f7d21fd43ba519dae5ccfcdc138095;hp=e093660868ad5150f3d57f6c15d0280734f5ba1f;hpb=4acd975c86347538ee61a52ecde13ae924436048;p=sfa.git diff --git a/Makefile b/Makefile index e0936608..144c06c3 100644 --- a/Makefile +++ b/Makefile @@ -24,8 +24,8 @@ SCMURL=should-be-redefined-by-specfile python: version -version: sfa/util/version.py -sfa/util/version.py: sfa/util/version.py.in +version: sfa/util/version.py +sfa/util/version.py: sfa/util/version.py.in force sed -e "s,@VERSIONTAG@,$(VERSIONTAG),g" -e "s,@SCMURL@,$(SCMURL),g" sfa/util/version.py.in > $@ xmlbuilder-install: @@ -125,12 +125,16 @@ force: ########## # a lot of stuff in the working dir is just noise -scan: +files: @find . -type f | egrep -v '^\./\.|/\.git/|/\.svn/|TAGS|AA-|~$$|egg-info|\.(py[co]|doc|html|pdf|png|svg|out|bak|dg|pickle)$$' + +git-files: + @git ls-files | grep -v '\.doc$$' + tags: - $(MAKE) scan | xargs etags + $(MAKE) git-files | xargs etags -.PHONY: scan tags +.PHONY: files tags signatures: (cd sfa/methods; grep 'def.*call' *.py > SIGNATURES) @@ -149,7 +153,7 @@ SSHURL:=root@$(PLC):/ SSHCOMMAND:=ssh root@$(PLC) else ifdef PLCHOSTLXC -SSHURL:=root@$(PLCHOSTLXC):/var/lib/lxc/$(GUESTNAME)/rootfs +SSHURL:=root@$(PLCHOSTLXC):/vservers/$(GUESTNAME)/rootfs SSHCOMMAND:=ssh root@$(PLCHOSTLXC) ssh $(GUESTHOSTNAME) else ifdef PLCHOSTVS