/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-clients.conf.xml (OPTIONS): Moved up "extended_timeout" to
                                     order options alphabetically.
* clients.conf: Language change in comment.

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.2.3
 
26
version=1.3.1
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=$(COVERAGE) $(LINK_FORTIFY) $(foreach flag,$(LINK_FORTIFY_LD),-Xlinker $(flag))
 
57
LDFLAGS=-Xlinker --as-needed $(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 \
92
92
        plugins.d/mandos-client.8mandos \
93
93
        plugins.d/password-prompt.8mandos plugins.d/usplash.8mandos \
94
94
        plugins.d/splashy.8mandos plugins.d/askpass-fifo.8mandos \
95
 
        plugins.d/plymouth.8mandos
 
95
        plugins.d/plymouth.8mandos intro.8mandos
96
96
 
97
97
htmldocs=$(addsuffix .xhtml,$(DOCS))
98
98
 
119
119
%.8mandos.xhtml: %.xml common.ent legalnotice.xml
120
120
        $(DOCBOOKTOHTML)
121
121
 
 
122
intro.8mandos: intro.xml common.ent legalnotice.xml
 
123
        $(DOCBOOKTOMAN)
 
124
intro.8mandos.xhtml: intro.xml common.ent legalnotice.xml
 
125
        $(DOCBOOKTOHTML)
 
126
 
122
127
mandos.8: mandos.xml common.ent mandos-options.xml overview.xml \
123
128
                legalnotice.xml
124
129
        $(DOCBOOKTOMAN)
210
215
                $@)
211
216
 
212
217
plugins.d/mandos-client: plugins.d/mandos-client.c
213
 
        $(LINK.c) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) $(strip\
214
 
                ) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
218
        $(LINK.c) $^ -lrt $(GNUTLS_LIBS) $(AVAHI_LIBS) $(strip\
 
219
                ) $(GPGME_LIBS) $(LOADLIBES) $(LDLIBS) -o $@
215
220
 
216
221
.PHONY : all doc html clean distclean run-client run-server install \
217
222
        install-server install-client uninstall uninstall-server \