/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: 2008-12-29 02:44:54 UTC
  • Revision ID: teddy@fukt.bsnet.se-20081229024454-nbsei556dwy5azr1
* mandos (Client.timeout, Client.interval): Changed from being a
                                            property to be a normal
                                            attribute.
  (Client._timeout, Client._interval): Removed.
  (Client._timeout_milliseconds): Changed from being an attribute to
                                  be a method "timeout_milliseconds".
                                  All users changed.
  (Client._interval_milliseconds): Changed from being an attribute to
                                   be method "interval_milliseconds".
                                   All users changed.
  (Client.__init__): Take additional "use_dbus" keyword argument.
                     Only provide D-Bus interface if "use_dbus" is
                     True.
  (Client.use_dbus): New attribute.
  (Client.dbus_object_path): Changed to only be set if "self.use_dbus"
                             is True.
  (Client.enable, Client.disable, Client.checker_callback,
  Client.bump_timeout, Client.start_checker, Client.stop_checker):
  Only emit D-Bus signals if "self.use_dbus".
  (Client.SetChecker, Client.SetHost, Client.Enable): Bug fix: Emit
                                                      D-Bus signals.
  (Client.SetInterval, Client.SetTimeout): Changed to emit D-Bus
                                           signals.

  (main): Remove deprecated "default" keyword argument to "--check"
          option.  Added new "--no-dbus" option.  Added corresponding
          "use_dbus" server configuration option.  Only provide D-Bus
          interface and emit D-Bus signals if "use_dbus".  Pass
          "use_dbus" on to Client constructor.

* mandos-options.xml ([@id="dbus"]): New option.

* mandos.conf (use_dbus): New option.

* mandos.conf.xml (OPTIONS): New option "use_dbus".
  (EXAMPLE): - '' -

* mandos.xml (SYNOPSIS): New option "--no-dbus".
  (D-BUS INTERFACE): New section.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
15
15
OPTIMIZE=-Os
16
16
LANGUAGE=-std=gnu99
17
17
htmldir=man
18
 
version=1.0
 
18
version=1.0.2
19
19
SED=sed
20
20
 
21
21
## Use these settings for a traditional /usr/local install
45
45
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
46
46
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
47
47
        -DVERSION='"$(version)"'
48
 
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY)
 
48
LDFLAGS=$(COVERAGE) $(foreach flag,$(LINK_FORTIFY),-Xlinker $(flag))
49
49
 
50
50
# Commands to format a DocBook <refentry> document into a manual page
51
51
DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
70
70
        /usr/share/xml/docbook/stylesheet/nwalsh/xhtml/docbook.xsl \
71
71
        $<; $(HTMLPOST) $@
72
72
# Fix citerefentry links
73
 
HTMLPOST=$(SED) --in-place --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
 
73
HTMLPOST=$(SED) --in-place \
 
74
        --expression='s/\(<a class="citerefentry" href="\)\("><span class="citerefentry"><span class="refentrytitle">\)\([^<]*\)\(<\/span>(\)\([^)]*\)\()<\/span><\/a>\)/\1\3.\5\2\3\4\5\6/g'
74
75
 
75
76
PLUGINS=plugins.d/password-prompt plugins.d/mandos-client \
76
77
        plugins.d/usplash plugins.d/splashy plugins.d/askpass-fifo
77
78
CPROGS=plugin-runner $(PLUGINS)
78
 
PROGS=mandos mandos-keygen $(CPROGS)
 
79
PROGS=mandos mandos-keygen mandos-list $(CPROGS)
79
80
DOCS=mandos.8 plugin-runner.8mandos mandos-keygen.8 \
80
81
        plugins.d/mandos-client.8mandos \
81
82
        plugins.d/password-prompt.8mandos mandos.conf.5 \
86
87
 
87
88
objects=$(addsuffix .o,$(CPROGS))
88
89
 
89
 
all: $(PROGS)
 
90
all: $(PROGS) mandos.lsm
90
91
 
91
92
doc: $(DOCS)
92
93
 
148
149
 
149
150
# Update all these files with version number $(version)
150
151
common.ent: Makefile
151
 
        $(SED) --in-place --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' $@
 
152
        $(SED) --in-place \
 
153
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
 
154
                $@
152
155
 
153
156
mandos: Makefile
154
 
        $(SED) --in-place --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' $@
 
157
        $(SED) --in-place \
 
158
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
159
                $@
155
160
 
156
161
mandos-keygen: Makefile
157
 
        $(SED) --in-place --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' $@
 
162
        $(SED) --in-place \
 
163
                --expression='s/^\(VERSION="\)[^"]*"$$/\1$(version)"/' \
 
164
                $@
 
165
 
 
166
mandos-list: Makefile
 
167
        $(SED) --in-place \
 
168
                --expression='s/^\(version = "\)[^"]*"$$/\1$(version)"/' \
 
169
                $@
 
170
 
 
171
mandos.lsm: Makefile
 
172
        $(SED) --in-place \
 
173
                --expression='s/^\(Version:\).*/\1\t$(version)/' \
 
174
                $@
 
175
        $(SED) --in-place \
 
176
                --expression='s/^\(Entered-date:\).*/\1\t$(shell date --rfc-3339=date --reference=Makefile)/' \
 
177
                $@
158
178
 
159
179
plugins.d/mandos-client: plugins.d/mandos-client.o
160
180
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
202
222
 
203
223
install: install-server install-client-nokey
204
224
 
205
 
install-html: $(htmldocs)
 
225
install-html: html
206
226
        install --directory $(htmldir)
207
227
        install --mode=u=rw,go=r --target-directory=$(htmldir) \
208
228
                $(htmldocs)