/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-08-03 01:09:36 UTC
  • mfrom: (24.1.9 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080803010936-ujme8tgxceszfbi1
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
                            Take an additional non-option argument and
                            parse it as a plus-separated and -prefixed
                            list of additional options.

* plugins.d/mandosclient.c (DH_BITS): Replaced with
                                      "mandos_context.dh_bits".  All
                                      users changed.
  (certdir): Renamed to "keydir".  All users changed.
  (certfile): Renamed to "pubkeyfile".  All users changed.
  (certkey): Renamed to "seckeyfile".  All users changed.
  (encrypted_session): Replaced with "mandos_context".  All users
                       changed.
  (initgnutls): Take additional "session" and "dh_params" arguments.
                All callers changed.
  (start_mandos_communication): Take additional "mc" argument.  All
                                callers changed.  Print target IPv6
                                address if different than supplied
                                string.
  (simple_poll) Replaced with "mandos_context.simple_poll".  All users
                changed.
  (server): Replaced with "mandos_context.server".  All users changed.
  (main): Default interface to "eth0".  Rename "--certdir" to
          "--keydir", "--certkey" to "--seckey", and "--certfile" to
          "--pubkey".  New options "--dh-bits" and "--priority".  If
          the interface is not up, bring it up.

Show diffs side-by-side

added added

removed removed

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