/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: 2008-07-22 06:23:29 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080722062329-jaex5y5mslf6sqjx
* mandos-clients.conf ([DEFAULT]): New section.

* plugins.d/mandosclient.c (start_mandos_communication): Only print if
                                                         debugging.
                                                         Print server
                                                         name.
                                                         Bug fix: Loop
                                                         until suc-
                                                         cess.

* server.py (serverName): Set via option, not globally.
  (Client.__init__): Removed argument "options".  Require "timeout"
                     and "interval" arguments.
  (tcp_handler.handle): Set "priority" from self.server.options.
  (main): Removed "--timeout" and "--interval" options.  New options
          "--priority" and "--servicename".  Add defaults for
          "timeout" and "interval".  Set "serviceName" from options.
          Do not pass "options" to "Client()".

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
CXXFLAGS=-Wall -W -g
2
 
LDFLAGS=-lgnutls
3
 
 
4
 
all: client server
5
 
 
 
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
 
3
#COVERAGE=--coverage
 
4
OPTIMIZE=-Os
 
5
LANGUAGE=-std=gnu99
 
6
 
 
7
# Do not change these two
 
8
CFLAGS=$(WARN) $(COVERAGE) $(DEBUG) $(OPTIMIZE) $(LANGUAGE)
 
9
LDFLAGS=$(COVERAGE)
 
10
 
 
11
PROGS=plugbasedclient plugins.d/mandosclient plugins.d/passprompt
 
12
 
 
13
objects=$(shell for p in $(PROGS); do echo $${p}.o; done)
 
14
 
 
15
all: $(PROGS)
 
16
 
 
17
plugbasedclient: plugbasedclient.o
 
18
        $(LINK.o) -lgnutls $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
19
 
 
20
plugins.d/mandosclient: plugins.d/mandosclient.o
 
21
        $(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
22
 
 
23
plugins.d/passprompt: plugins.d/passprompt.o
 
24
        $(LINK.o) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
25
 
 
26
.PHONY : clean
6
27
clean:
7
 
        rm -f server client client_debug
8
 
 
9
 
client_debug: client
10
 
        mv -f client client.tmp
11
 
        $(MAKE) client CXXFLAGS="$(CXXFLAGS) -DDEBUG -DCERT_ROOT=\\\"./\\\""
12
 
        mv client client_debug
13
 
        mv client.tmp client
 
28
        -rm -f $(PROGS) $(objects) core