/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

plugbasedclient:
        Added support to disable plugins
        Added support to change plugin directory

mandosclient.c
        Fixed some funtion calls that lacked error handling
        small bugfix

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 -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
2
DEBUG=-ggdb3
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
6
3
#COVERAGE=--coverage
7
4
OPTIMIZE=-Os
8
5
LANGUAGE=-std=gnu99
9
6
 
10
7
# Do not change these two
11
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) $(LANGUAGE)
 
8
CFLAGS=$(WARN) $(COVERAGE) $(DEBUG) $(OPTIMIZE) $(LANGUAGE)
12
9
LDFLAGS=$(COVERAGE)
13
10
 
14
 
PROGS=mandos-client plugins.d/password-request plugins.d/password-prompt
 
11
PROGS=plugbasedclient plugins.d/mandosclient plugins.d/passprompt
15
12
 
16
13
objects=$(shell for p in $(PROGS); do echo $${p}.o; done)
17
14
 
18
15
all: $(PROGS)
19
16
 
20
 
mandos-client: mandos-client.o
 
17
plugbasedclient: plugbasedclient.o
21
18
        $(LINK.o) -lgnutls $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
22
19
 
23
 
plugins.d/password-request: plugins.d/password-request.o
 
20
plugins.d/mandosclient: plugins.d/mandosclient.o
24
21
        $(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
25
22
 
26
 
plugins.d/password-prompt: plugins.d/password-prompt.o
 
23
plugins.d/passprompt: plugins.d/passprompt.o
27
24
        $(LINK.o) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
28
25
 
29
 
.PHONY : all clean distclean run-client run-server
30
 
 
 
26
.PHONY : clean
31
27
clean:
32
 
        -rm --force $(PROGS) $(objects) core
33
 
 
34
 
distclean: clean
35
 
mostlyclean: clean
36
 
maintainer-clean: clean
37
 
 
38
 
check: all
39
 
        ./mandos --check
40
 
 
41
 
run-client: all
42
 
        ./mandos-client --plugin-dir=plugins.d --options-for=password-request:--keydir=keydir
43
 
 
44
 
run-server: all
45
 
        ./mandos --debug --configdir=.
 
28
        -rm -f $(PROGS) $(objects) core