/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-08-14 21:03:26 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080814210326-u58d7rj78g3i0ed4
* plugins.d/password-request.c (init_gnutls_global): Renamed
                               "pubkeyfile" to "pubkeyfilename" and
                               "seckeyfile" to "seckeyfilename".
  (combinepath): Changed to use asprintf instead of malloc and memcpy.

  (main): Renamed "pubkeyfile" to "pubkeyname", renamed "seckeyfile"
          to "seckeyname" and created new non-const variables
          "pubkeyfilename" and "seckeyfilename".

* mandos (AvahiService.__init__): Bug fix: initialize
                                  "self.max_renames".
  (AvahiService.rename): Bug fix: use "self.name" instead of "name".

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
20
20
# MANDIR=/usr/local/man
21
21
MANDIR=/usr/share/man
22
22
 
23
 
GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
24
 
GNUTLS_LIBS=$(shell libgnutls-config --libs)
25
 
AVAHI_CFLAGS=$(shell pkg-config --cflags-only-I avahi-core)
26
 
AVAHI_LIBS=$(shell pkg-config --libs avahi-core)
27
 
GPGME_CFLAGS=$(shell gpgme-config --cflags)
28
 
GPGME_LIBS=$(shell gpgme-config --libs)
29
 
 
30
23
# Do not change these two
31
 
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) \
32
 
        $(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 
24
CFLAGS=$(WARN) $(DEBUG) $(FORTIFY) $(COVERAGE) $(OPTIMIZE) $(LANGUAGE)
33
25
LDFLAGS=$(COVERAGE)
34
26
 
35
27
DOCBOOKTOMAN=xsltproc --nonet \
37
29
        --param make.year.ranges                1 \
38
30
        --param make.single.year.ranges         1 \
39
31
        --param man.output.quietly              1 \
40
 
        --param man.authors.section.enabled     0 \
41
 
         /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl
42
 
# DocBook-to-man post-processing to fix a \n escape bug
43
 
MANPOST=sed --in-place --expression='s,\\en,\en,g;s,\\een,\\en,g'
 
32
        --param man.authors.section.enabled     0
44
33
 
45
34
PLUGINS=plugins.d/password-prompt plugins.d/password-request
46
35
PROGS=plugin-runner $(PLUGINS)
49
38
        plugins.d/password-prompt.8mandos mandos.conf.5 \
50
39
        mandos-clients.conf.5
51
40
 
52
 
objects=$(addsuffix .o,$(PROGS))
 
41
objects=$(shell for p in $(PROGS); do echo $${p}.o; done)
53
42
 
54
43
all: $(PROGS)
55
44
 
56
45
doc: $(DOCS)
57
46
 
58
47
%.5: %.xml
59
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $(notdir $@)
 
48
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
60
49
 
61
50
%.8: %.xml
62
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $(notdir $@)
 
51
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
63
52
 
64
53
%.8mandos: %.xml
65
 
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^); $(MANPOST) $(notdir $@)
 
54
        cd $(dir $^); $(DOCBOOKTOMAN) $(notdir $^)
 
55
 
 
56
plugin-runner: plugin-runner.o
 
57
        $(LINK.o) -lgnutls $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
66
58
 
67
59
plugins.d/password-request: plugins.d/password-request.o
68
 
        $(LINK.o) $(GNUTLS_LIBS) $(AVAHI_LIBS) $(GPGME_LIBS) \
69
 
                $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
70
 
 
71
 
.PHONY : all doc clean distclean run-client run-server install \
 
60
        $(LINK.o) -lgnutls -lavahi-core -lgpgme $(COMMON) $^ \
 
61
                $(LOADLIBES) $(LDLIBS) -o $@
 
62
 
 
63
plugins.d/password-prompt: plugins.d/password-prompt.o
 
64
        $(LINK.o) $(COMMON) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
65
 
 
66
.PHONY : all clean distclean run-client run-server install \
72
67
        install-server install-client uninstall uninstall-server \
73
68
        uninstall-client purge purge-server purge-client
74
69