/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: 2009-01-27 15:42:41 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090127154241-x0kosjtvuo0iuptd
* plugins.d/mandos-client.c (main): Use separate bool variable instead
                                    of clumsy NUL character in
                                    "tempdir".  Bug fix: Don't try to
                                    remove temp directory if it was
                                    never created.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
1
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs \
2
2
        -Wswitch-default -Wswitch-enum -Wunused-parameter \
3
 
        -Wstrict-aliasing=1 -Wextra -Wfloat-equal -Wundef -Wshadow \
 
3
        -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow \
4
4
        -Wunsafe-loop-optimizations -Wpointer-arith \
5
5
        -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings \
6
6
        -Wconversion -Wstrict-prototypes -Wold-style-definition \
16
16
OPTIMIZE=-Os
17
17
LANGUAGE=-std=gnu99
18
18
htmldir=man
19
 
version=1.0.12
 
19
version=1.0.5
20
20
SED=sed
21
21
 
22
22
## Use these settings for a traditional /usr/local install
35
35
INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
36
36
##
37
37
 
38
 
GNUTLS_CFLAGS=$(shell pkg-config --cflags-only-I gnutls)
39
 
GNUTLS_LIBS=$(shell pkg-config --libs gnutls)
 
38
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 
39
GNUTLS_LIBS=$(shell libgnutls-config --libs)
40
40
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
41
41
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
42
 
GPGME_CFLAGS=$(shell gpgme-config --cflags; getconf LFS_CFLAGS)
43
 
GPGME_LIBS=$(shell gpgme-config --libs; getconf LFS_LIBS; \
44
 
        getconf LFS_LDFLAGS)
 
42
GPGME_CFLAGS=$(shell gpgme-config --cflags)
 
43
GPGME_LIBS=$(shell gpgme-config --libs)
45
44
 
46
45
# Do not change these two
47
46
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
152
151
# Update all these files with version number $(version)
153
152
common.ent: Makefile
154
153
        $(SED) --in-place \
155
 
                --expression='s/^\(<!ENTITY version "\)[^"]*">$$/\1$(version)">/' \
 
154
                --expression='s/^\(<ENTITY VERSION "\)[^"]*">$$/\1$(version)"/' \
156
155
                $@
157
156
 
158
157
mandos: Makefile
214
213
 
215
214
# Run the server with a local config
216
215
run-server: confdir/mandos.conf confdir/clients.conf
217
 
        ./mandos --debug --no-dbus --configdir=confdir $(SERVERARGS)
 
216
        ./mandos --debug --configdir=confdir $(SERVERARGS)
218
217
 
219
218
# Used by run-server
220
219
confdir/mandos.conf: mandos.conf
286
285
        install --mode=u=rw,go=r initramfs-tools-hook-conf \
287
286
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos
288
287
        install initramfs-tools-script \
289
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos
 
288
                $(INITRAMFSTOOLS)/scripts/local-top/mandos
290
289
        install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
291
290
        gzip --best --to-stdout mandos-keygen.8 \
292
291
                > $(MANDIR)/man8/mandos-keygen.8.gz
333
332
                $(PREFIX)/lib/mandos/plugins.d/askpass-fifo \
334
333
                $(INITRAMFSTOOLS)/hooks/mandos \
335
334
                $(INITRAMFSTOOLS)/conf-hooks.d/mandos \
336
 
                $(INITRAMFSTOOLS)/scripts/init-premount/mandos \
 
335
                $(INITRAMFSTOOLS)/scripts/local-top/mandos \
337
336
                $(MANDIR)/man8/plugin-runner.8mandos.gz \
338
337
                $(MANDIR)/man8/mandos-keygen.8.gz \
339
338
                $(MANDIR)/man8/password-prompt.8mandos.gz \