/mandos/release

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

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: Teddy Hogeborn
  • Date: 2009-01-05 23:26:06 UTC
  • mfrom: (237.2.11 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20090105232606-2iohqjcsfj076z7i
Merge from trunk, but disable the unfinished D-Bus feature:

* Makefile (PROGS): Removed "mandos-list".
  (mandos-list): Removed.
* mandos (main): Hide "--no-dbus" option.  Hard-code "use_dbus" to
                 "False".
* mandos-list: Removed.
* mandos.xml (SYNOPSIS): Removed "--no-dbus" option.
  (OPTIONS): - '' -
  (D-BUS INTERFACE): Removed section.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
76
76
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
77
77
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
78
78
CPROGS=plugin-runner $(PLUGINS)
79
 
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
 
79
PROGS=mandos mandos-keygen $(CPROGS)
80
80
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
81
81
        plugins.d/mandos-client.8mandos \
82
82
        plugins.d/password-prompt.8mandos mandos.conf.5 \
163
163
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
164
164
                $@
165
165
 
166
 
mandos-list: Makefile
167
 
        $(SED) --in-place \
168
 
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
169
 
                $@
170
 
 
171
166
mandos.lsm: Makefile
172
167
        $(SED) --in-place \
173
168
                --expression='s/^\(Version:\).*/\1\t$(version)/' \