From: Thierry Parmentelat Date: Mon, 6 Jul 2009 19:57:10 +0000 (+0000) Subject: no need to run make index anymore X-Git-Tag: sfa-0.9-0@14641~148 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=08ab670513d36fe052b1c6ca95833abe806bec9d;p=sfa.git no need to run make index anymore --- diff --git a/Makefile b/Makefile index 57c74ce5..0b356126 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ keyconvert-clean: .PHONY: keyconvert keyconvert-install keyconvert-clean ########## -python: index +python: python-install: python setup.py install --root=$(DESTDIR) @@ -44,19 +44,6 @@ tags: .PHONY: tags -########## indexes -subdirs = client methods plc server trust util -init := sfa/__init__.py $(foreach subdir, $(subdirs), sfa/$(subdir)/__init__.py) - -force: -.PHONY: force - -index: $(init) -.PHONY: index - -$(init): - touch $@ - ########## sync # 2 forms are supported # (*) if your plc root context has direct ssh access: diff --git a/wsdl/Makefile b/wsdl/Makefile index e4f58ef2..11efa3ac 100644 --- a/wsdl/Makefile +++ b/wsdl/Makefile @@ -4,20 +4,16 @@ ALL := $(SFA) registry.wsdl slice-manager.wsdl aggregate.wsdl all: $(SFA) -# create missing __init__.py files -../sfa/__init__.py: - make -C .. index - -registry.wsdl: ../sfa/__init__.py +registry.wsdl: PYTHONPATH=../ ./gw2wsdl.py --registry > $@ -slice-manager.wsdl: ../sfa/__init__.py +slice-manager.wsdl: PYTHONPATH=../ ./gw2wsdl.py --slice-manager > $@ -aggregate.wsdl: ../sfa/__init__.py +aggregate.wsdl: PYTHONPATH=../ ./gw2wsdl.py --aggregate > $@ -sfa.wsdl: ../sfa/__init__.py +sfa.wsdl: PYTHONPATH=../ ./gw2wsdl.py --registry --slice-manager --aggregate > $@ clean: