← Back to branch summary

~thomir-deactivatedaccount/charm-haproxy/make-config-less-insane

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: David Britton
  • Date: 2015-05-15 16:54:14 UTC
  • mfrom: (92.2.3 merge-services-fix)
  • mto: This revision was merged to the branch mainline in revision 94.
  • Revision ID: dpb@canonical.com-20150515165414-u2jeku38e939depf
- Merge in Bjorn's branch
- fix lint
- Removed 'revision', added to bzrignore
- fix proof
- fix proof make target

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
9
9
 
10
10
build: test lint proof
11
11
 
12
 
revision:
13
 
        @test -f revision || echo 0 > revision
14
 
 
15
 
proof: revision
 
12
proof:
16
13
        @echo Proofing charm...
17
 
        @(charm proof $(PWD) || [ $$? -eq 100 ]) && echo OK
18
 
        @test `cat revision` = 0 && rm revision
 
14
        @charm proof
19
15
 
20
16
.venv:
21
17
        sudo apt-get install -y python-apt python-virtualenv python-jinja2
28
24
 
29
25
lint:
30
26
        @echo Checking for Python syntax...
31
 
        @flake8 $(HOOKS_DIR) --ignore=E123 --exclude=$(HOOKS_DIR)/charmhelpers && echo OK
 
27
        @flake8 $(HOOKS_DIR) --ignore=E123 --exclude=$(HOOKS_DIR)/charmhelpers
32
28
 
33
29
sourcedeps: $(PWD)/config-manager.txt
34
30
        @echo Updating source dependencies...