slightly smarter make tags

[sfa.git] / Makefile

diff --git a/Makefile b/Makefile
index db3b5f7..144c06c 100644 (file)
--- 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:
@@ -127,8 +127,12 @@ force:
 # a lot of stuff in the working dir is just noise
 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) files | xargs etags
+       $(MAKE) git-files | xargs etags
 
 .PHONY: files tags
 
@@ -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