/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2012-05-07 20:46:51 UTC
  • Revision ID: teddy@recompile.se-20120507204651-qx5o5ztwmau54mh4
* mandos-monitor: Speedup: Use properties from D-Bus
                  GetAllClientsWithProperties() call.  Also use
                  super() properly - only use keyword arguments and
                  strip them off as "kwargs" is passed on.
  (MandosClientPropertyCache.__init__): Take new "properties"
                                        argument; use it to skip
                                        calling D-Bus GetAll() method.
                                        Call super().  Bind self._
  (MandosClientPropertyCache._property_changed): New helper function.
  (MandosClientPropertyCache.property_changed): Changed to take
                                                keyword arguments.
  (MandosClientPropertyCache.delete): Bug fix: Don't call
                                      super().__init__().
  (MandosClientWidget.__init__): Don't take *args.  Strip used keyword
                                 arguments before calling super().
  (MandosClientWidget.property_changed): Removed dead code.
  (MandosClientWidget.delete): Don't take *args.
  (MandosClientWidget.property_changed): Don't take "value" argument,
                                         since it is not used.
  (ConstrainedListBox.keypress): Take *args, **kwargs and pass them on
                                 to super().

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.4.1
 
26
version=1.5.3
27
27
SED=sed
28
28
 
29
29
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
255
255
        @echo "###################################################################"
256
256
        ./plugin-runner --plugin-dir=plugins.d \
257
257
                --config-file=plugin-runner.conf \
258
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
 
258
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
259
259
                $(CLIENTARGS)
260
260
 
261
261
# Used by run-client
264
264
        ./mandos-keygen --dir keydir --force
265
265
 
266
266
# Run the server with a local config
267
 
run-server: confdir/mandos.conf confdir/clients.conf
 
267
run-server: confdir/mandos.conf confdir/clients.conf statedir
268
268
        ./mandos --debug --no-dbus --configdir=confdir \
269
269
                --statedir=statedir $(SERVERARGS)
270
270
 
319
319
                > $(MANDIR)/man5/mandos.conf.5.gz
320
320
        gzip --best --to-stdout mandos-clients.conf.5 \
321
321
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
 
322
        gzip --best --to-stdout intro.8mandos \
 
323
                > $(MANDIR)/man8/intro.8mandos.gz
322
324
 
323
325
install-client-nokey: all doc
324
326
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
328
330
                install --mode=u=rwx \
329
331
                        --directory "$(CONFDIR)/plugins.d"; \
330
332
        fi
 
333
        install --mode=u=rwx,go=rx --directory \
 
334
                "$(CONFDIR)/network-hooks.d"
331
335
        install --mode=u=rwx,go=rx \
332
336
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
333
337
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \