/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1
WARN=-O -Wall -Wformat=2 -Winit-self -Wmissing-include-dirs -Wswitch-default -Wswitch-enum -Wunused-parameter -Wstrict-aliasing=2 -Wextra -Wfloat-equal -Wundef -Wshadow -Wunsafe-loop-optimizations -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wstrict-prototypes -Wold-style-definition -Wpacked -Wnested-externs -Wunreachable-code -Winline -Wvolatile-register-var 
2
DEBUG=-ggdb3
28 by Teddy Hogeborn
* server.conf: New file.
3
# For info about _FORTIFY_SOURCE, see
4
# <http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html>
5
FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
6
#COVERAGE=--coverage
24 by Teddy Hogeborn
* Makefile (OPTIMIZE): New; optimize for size.
7
OPTIMIZE=-Os
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
8
LANGUAGE=-std=gnu99
9
10
# Do not change these two
28 by Teddy Hogeborn
* server.conf: New file.
11
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) $(LANGUAGE)
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
12
LDFLAGS=$(COVERAGE)
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
13
24.1.25 by Björn Påhlsson
* clients.conf.xml: Renamed to "mandos-clients.conf.xml".
14
DOCBOOKTOMAN=xsltproc --nonet --param man.charmap.use.subset "0" --param make.year.ranges "1" --param make.single.year.ranges "1" --param man.output.quietly "1"
15
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
16
PROGS=mandos-client plugins.d/password-request plugins.d/password-prompt
24.1.25 by Björn Påhlsson
* clients.conf.xml: Renamed to "mandos-clients.conf.xml".
17
DOCS=mandos.8 mandos-client.8mandos plugins.d/password-request.8mandos plugins.d/password-prompt.8mandos mandos.conf.5 mandos-clients.conf.5
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
18
19
objects=$(shell for p in $(PROGS); do echo $${p}.o; done)
20
24.1.25 by Björn Påhlsson
* clients.conf.xml: Renamed to "mandos-clients.conf.xml".
21
all: $(PROGS) $(DOCS)
22
23
%.5: %.xml
50 by Teddy Hogeborn
* Makefile: Do DocBook manual conversion in a better way.
24
	cd $(shell dirname $^); $(DOCBOOKTOMAN) $(shell basename $^)
24.1.25 by Björn Påhlsson
* clients.conf.xml: Renamed to "mandos-clients.conf.xml".
25
26
%.8: %.xml
50 by Teddy Hogeborn
* Makefile: Do DocBook manual conversion in a better way.
27
	cd $(shell dirname $^); $(DOCBOOKTOMAN) $(shell basename $^)
24.1.25 by Björn Påhlsson
* clients.conf.xml: Renamed to "mandos-clients.conf.xml".
28
29
%.8mandos: %.xml
50 by Teddy Hogeborn
* Makefile: Do DocBook manual conversion in a better way.
30
	cd $(shell dirname $^); $(DOCBOOKTOMAN) $(shell basename $^)
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
31
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
32
mandos-client: mandos-client.o
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
33
	$(LINK.o) -lgnutls $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
34
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
35
plugins.d/password-request: plugins.d/password-request.o
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
36
	$(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
37
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
38
plugins.d/password-prompt: plugins.d/password-prompt.o
16 by Teddy Hogeborn
* Makefile: Include targets for all binaries.
39
	$(LINK.o) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
40
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
41
.PHONY : all clean distclean run-client run-server
42
1 by Björn Påhlsson
First working version with: IPv6, GnuTLS, X.509 certificates, DN
43
clean:
24.1.25 by Björn Påhlsson
* clients.conf.xml: Renamed to "mandos-clients.conf.xml".
44
	-rm --force $(PROGS) $(objects) $(DOCS) core
47 by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
45
46
distclean: clean
47
mostlyclean: clean
48
maintainer-clean: clean
49
50
check: all
51
	./mandos --check
52
53
run-client: all
54
	./mandos-client --plugin-dir=plugins.d --options-for=password-request:--keydir=keydir
55
56
run-server: all
57
	./mandos --debug --configdir=.