/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: 2011-07-25 18:49:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110725184917-m9eov06ex6vn9877
* mandos-monitor (MandosClientPropertyCache): Save match tag for
                                              PropertyChanged signal.
  (MandosClientPropertyCache.delete): New; unregister signal.
  (MandosClientWidget.__init__): Save matches for signals.
  (MandosClientWidget): Unregister signals.
  (UserInterface.find_and_remove_client): Log message when removing
                                          a nonexisting client.  Call
                                          client.delete() instead of
                                          self.remove_client().

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
7
7
        -Wpacked -Wnested-externs -Winline -Wvolatile-register-var
8
 
#       -Wunreachable-code
 
8
#       -Wunreachable-code 
9
9
#DEBUG=-ggdb3
10
10
# For info about _FORTIFY_SOURCE, see
11
11
# <http://www.kernel.org/doc/man-pages/online/pages/man7/feature_test_macros.7.html>
23
23
OPTIMIZE=-Os
24
24
LANGUAGE=-std=gnu99
25
25
htmldir=man
26
 
version=1.6.1
 
26
version=1.3.0
27
27
SED=sed
28
28
 
29
 
USER=$(firstword $(subst :, ,$(shell getent passwd _mandos || getent passwd nobody || echo 65534)))
30
 
GROUP=$(firstword $(subst :, ,$(shell getent group _mandos || getent group nobody || echo 65534)))
31
 
 
32
29
## Use these settings for a traditional /usr/local install
33
30
# PREFIX=$(DESTDIR)/usr/local
34
31
# CONFDIR=$(DESTDIR)/etc/mandos
35
32
# KEYDIR=$(DESTDIR)/etc/mandos/keys
36
33
# MANDIR=$(PREFIX)/man
37
34
# INITRAMFSTOOLS=$(DESTDIR)/etc/initramfs-tools
38
 
# STATEDIR=$(DESTDIR)/var/lib/mandos
39
35
##
40
36
 
41
37
## These settings are for a package-type install
44
40
KEYDIR=$(DESTDIR)/etc/keys/mandos
45
41
MANDIR=$(PREFIX)/share/man
46
42
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
47
 
STATEDIR=$(DESTDIR)/var/lib/mandos
48
43
##
49
44
 
50
45
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
56
51
        getconf LFS_LDFLAGS)
57
52
 
58
53
# Do not change these two
59
 
CFLAGS+=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
 
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
60
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
61
56
        -DVERSION='"$(version)"'
62
 
LDFLAGS+=-Xlinker --as-needed $(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
57
LDFLAGS=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
63
58
 
64
59
# Commands to format a DocBook <refentry> document into a manual page
65
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
68
63
        --param make.single.year.ranges         1 \
69
64
        --param man.output.quietly              1 \
70
65
        --param man.authors.section.enabled     0 \
71
 
        /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
72
67
        $(notdir $<); \
73
 
        $(MANPOST) $(notdir $@);\
74
 
        if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
75
 
        && type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
76
 
        man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
77
 
        fi >/dev/null)
 
68
        $(MANPOST) $(notdir $@))
78
69
# DocBook-to-man post-processing to fix a '\n' escape bug
79
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
80
71
 
101
92
        plugins.d/mandos-client.8mandos \
102
93
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
103
94
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
104
 
        plugins.d/plymouth.8mandos intro.8mandos
 
95
        plugins.d/plymouth.8mandos
105
96
 
106
97
htmldocs=$(addsuffix .xhtml,$(DOCS))
107
98
 
128
119
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
129
120
        $(DOCBOOKTOHTML)
130
121
 
131
 
intro.8mandos: intro.xml common.ent legalnotice.xml
132
 
        $(DOCBOOKTOMAN)
133
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
134
 
        $(DOCBOOKTOHTML)
135
 
 
136
122
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
137
123
                legalnotice.xml
138
124
        $(DOCBOOKTOMAN)
237
223
distclean: clean
238
224
mostlyclean: clean
239
225
maintainer-clean: clean
240
 
        -rm --force --recursive keydir confdir statedir
 
226
        -rm --force --recursive keydir confdir
241
227
 
242
228
check:  all
243
229
        ./mandos --check
244
 
        ./mandos-ctl --check
245
230
 
246
231
# Run the client with a local config and key
247
232
run-client: all keydir/seckey.txt keydir/pubkey.txt
258
243
        @echo "###################################################################"
259
244
        ./plugin-runner --plugin-dir=plugins.d \
260
245
                --config-file=plugin-runner.conf \
261
 
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt,--network-hook-dir=network-hooks.d \
 
246
                --options-for=mandos-client:--seckey=keydir/seckey.txt,--pubkey=keydir/pubkey.txt \
262
247
                $(CLIENTARGS)
263
248
 
264
249
# Used by run-client
267
252
        ./mandos-keygen --dir keydir --force
268
253
 
269
254
# Run the server with a local config
270
 
run-server: confdir/mandos.conf confdir/clients.conf statedir
271
 
        ./mandos --debug --no-dbus --configdir=confdir \
272
 
                --statedir=statedir $(SERVERARGS)
 
255
run-server: confdir/mandos.conf confdir/clients.conf
 
256
        @echo "#################################################################"
 
257
        @echo "# NOTE: Please IGNORE the error about \"Could not open file      #"
 
258
        @echo "# u'/var/run/mandos.pid'\" -  it is harmless and is caused by    #"
 
259
        @echo "# the server not running as root.  Do NOT run \"make run-server\" #"
 
260
        @echo "# server as root if you didn't also unpack and compile it thus. #"
 
261
        @echo "#################################################################"
 
262
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
273
263
 
274
264
# Used by run-server
275
265
confdir/mandos.conf: mandos.conf
280
270
        install --mode=u=rw $< $@
281
271
# Add a client password
282
272
        ./mandos-keygen --dir keydir --password >> $@
283
 
statedir:
284
 
        install --directory statedir
285
273
 
286
274
install: install-server install-client-nokey
287
275
 
292
280
 
293
281
install-server: doc
294
282
        install --directory $(CONFDIR)
295
 
        install --directory --mode=u=rwx --owner=$(USER) \
296
 
                --group=$(GROUP) $(STATEDIR)
297
283
        install --mode=u=rwx,go=rx mandos $(PREFIX)/sbin/mandos
298
284
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
299
285
                mandos-ctl
322
308
                > $(MANDIR)/man5/mandos.conf.5.gz
323
309
        gzip --best --to-stdout mandos-clients.conf.5 \
324
310
                > $(MANDIR)/man5/mandos-clients.conf.5.gz
325
 
        gzip --best --to-stdout intro.8mandos \
326
 
                > $(MANDIR)/man8/intro.8mandos.gz
327
311
 
328
312
install-client-nokey: all doc
329
313
        install --directory $(PREFIX)/lib/mandos $(CONFDIR)
333
317
                install --mode=u=rwx \
334
318
                        --directory "$(CONFDIR)/plugins.d"; \
335
319
        fi
336
 
        install --mode=u=rwx,go=rx --directory \
337
 
                "$(CONFDIR)/network-hooks.d"
338
320
        install --mode=u=rwx,go=rx \
339
321
                --target-directory=$(PREFIX)/lib/mandos plugin-runner
340
322
        install --mode=u=rwx,go=rx --target-directory=$(PREFIX)/sbin \
436
418
                $(DESTDIR)/etc/dbus-1/system.d/mandos.conf
437
419
                $(DESTDIR)/etc/default/mandos \
438
420
                $(DESTDIR)/etc/init.d/mandos \
439
 
                $(DESTDIR)/run/mandos.pid
 
421
                $(DESTDIR)/var/run/mandos.pid
440
422
        -rmdir $(CONFDIR)
441
423
 
442
424
purge-client: uninstall-client