← Back to branch summary

~ltrager/maas/lp1654432_2.1

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Gavin Panella
  • Date: 2012-04-20 16:09:23 UTC
  • mto: This revision was merged to the branch mainline in revision 494.
  • Revision ID: gavin.panella@canonical.com-20120420160923-nnaeek311lxlf4sd
Control Apache via the service mechanism, calling it 'web'. Renamed the existing 'web' service to 'webapp'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
124
124
# Development services.
125
125
#
126
126
 
127
 
service_names := pserv reloader txlongpoll web
 
127
service_names := pserv reloader txlongpoll web webapp
128
128
services := $(patsubst %,services/%/,$(service_names))
129
129
 
130
130
run:
131
131
        @services/run $(service_names)
132
132
 
133
 
run+web:
134
 
        @services/run $(service_names) +web
 
133
runui+webapp:
 
134
        @services/run $(service_names) +webapp
135
135
 
136
136
start: $(addsuffix @start,$(services))
137
137
 
148
148
define phony_services_targets
149
149
  restart
150
150
  run
151
 
  run+web
 
151
  run+webapp
152
152
  shutdown
153
153
  start
154
154
  status
195
195
 
196
196
services/txlongpoll/@deps: bin/twistd.txlongpoll
197
197
 
198
 
services/web/@deps: bin/maas dev-db
 
198
services/web/@deps:
 
199
 
 
200
services/webapp/@deps: bin/maas dev-db
199
201
 
200
202
#
201
203
# Phony stuff.