/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

* mandos: Never call .Reset() on a defunct Avahi entry group.
  (AvahiService.remove): Only do group.Reset(), as before.
  (AvahiService.add): Only create new group if necessary.
  (AvahiService.cleanup): Also do group.Free() if a group exists.
  (AvahiService.server_state_changed): Call .cleanup() on errors.
                                       Also log error parameter, if
                                       passed.

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.4.1
 
26
version=1.3.0
27
27
SED=sed
28
28
 
29
29
## Use these settings for a traditional /usr/local install
54
54
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
55
55
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS) \
56
56
        -DVERSION='"$(version)"'
57
 
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))
58
58
 
59
59
# Commands to format a DocBook <refentry> document into a manual page
60
60
DOCBOOKTOMAN=$(strip cd $(dir $<); xsltproc --nonet --xinclude \
65
65
        --param man.authors.section.enabled     0 \
66
66
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
67
67
        $(notdir $<); \
68
 
        $(MANPOST) $(notdir $@);\
69
 
        LANG=en_US.UTF-8 MANWIDTH=80 man --warnings --encoding=UTF-8 \
70
 
        --local-file $(notdir $@) >/dev/null)
 
68
        $(MANPOST) $(notdir $@))
71
69
# DocBook-to-man post-processing to fix a '\n' escape bug
72
70
MANPOST=$(SED) --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
73
71
 
94
92
        plugins.d/mandos-client.8mandos \
95
93
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
96
94
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
97
 
        plugins.d/plymouth.8mandos intro.8mandos
 
95
        plugins.d/plymouth.8mandos
98
96
 
99
97
htmldocs=$(addsuffix .xhtml,$(DOCS))
100
98
 
121
119
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
122
120
        $(DOCBOOKTOHTML)
123
121
 
124
 
intro.8mandos: intro.xml common.ent legalnotice.xml
125
 
        $(DOCBOOKTOMAN)
126
 
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
127
 
        $(DOCBOOKTOHTML)
128
 
 
129
122
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
130
123
                legalnotice.xml
131
124
        $(DOCBOOKTOMAN)
217
210
                $@)
218
211
 
219
212
plugins.d/mandos-client: plugins.d/mandos-client.c
220
 
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
221
 
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
 
213
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
 
214
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
222
215
 
223
216
.PHONY : all doc html clean distclean run-client run-server install \
224
217
        install-server install-client uninstall uninstall-server \
260
253
 
261
254
# Run the server with a local config
262
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 "#################################################################"
263
262
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
264
263
 
265
264
# Used by run-server