/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

  • Committer: Teddy Hogeborn
  • Date: 2008-07-21 15:34:44 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080721153444-lugbjkj1oq65ugq3
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
                     $(LANGUAGE).
  (WARN, DEBUG, COVERAGE, LANGUAGE): New.
  (LDFLAGS): New; use $(COVERAGE)

* plugbasedclient.c: Added copyright header.
  (process.buffer_size, process.buffer_length): Changed to "size_t".
  (main): Cast arguments to malloc and realloc.  Detect read errors
          from processes.

* mandosclient.c: Added copyright header.
  (interface): Moved to inside "main".
  (gpg_packet_decrypt): Renamed to "pgp_packet_decrypt"; all callers
                        changed.  Changed "new_packet_capacity" and
                        "new_packet_length" to be ssize_t.  Cast
                        arguments to realloc.
  (debuggnutls): Attribute "level" argument as unused.
  (empty_log): Attribute "level" and "txt" arguments as unused.
  (start_mandos_communication): New argument "if_index".  Bug fix:
                                check ret, no tcp_sd, for errors from
                                setsockopt.  Use "if_index" directly
                                instead of looking up the index.  Loop
                                around fwrite until all data is written.
  (resolve_callback): Attribute "txt", and "flags" as usused.  Added
                      default case to switch.  Also show server host
                      name.  Call start_mandos_communication with
                      "interface".
  (browse_callback): Added default case to switch.
  (main): Variable "interface" moved here.  Cast "srand" argument.
          Bug fix: Call avahi_s_service_browser_new with index of
          "interface", not "eth0".

* passprompt.c: Added copyright header.
  (termination_handler): Attribute "signum" argument as unused.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
OPTIMIZE=-Os
8
4
LANGUAGE=-std=gnu99
9
5
 
10
6
# Do not change these two
11
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) $(LANGUAGE)
12
7
LDFLAGS=$(COVERAGE)
 
8
CFLAGS=$(WARN) $(COVERAGE) $(DEBUG) $(LANGUAGE)
13
9
 
14
 
PROGS=mandos-client plugins.d/password-request plugins.d/password-prompt
 
10
PROGS=plugbasedclient plugins.d/mandosclient plugins.d/passprompt
15
11
 
16
12
objects=$(shell for p in $(PROGS); do echo $${p}.o; done)
17
13
 
18
14
all: $(PROGS)
19
15
 
20
 
mandos-client: mandos-client.o
 
16
plugbasedclient: plugbasedclient.o
21
17
        $(LINK.o) -lgnutls $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
22
18
 
23
 
plugins.d/password-request: plugins.d/password-request.o
 
19
plugins.d/mandosclient: plugins.d/mandosclient.o
24
20
        $(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
25
21
 
26
 
plugins.d/password-prompt: plugins.d/password-prompt.o
 
22
plugins.d/passprompt: plugins.d/passprompt.o
27
23
        $(LINK.o) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
28
24
 
29
 
.PHONY : all clean distclean run-client run-server
30
 
 
 
25
.PHONY : clean
31
26
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=.
 
27
        -rm -f $(PROGS) $(objects) core