/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: 2019-09-03 18:43:11 UTC
  • Revision ID: teddy@recompile.se-20190903184311-zr795sh32mmq2drk
mandos: Only join() still running checker processes

* mandos (Client.checker_callback): Only do .join() on checker if it
                                    is not None.

Show diffs side-by-side

added added

removed removed

Lines of Context:
43
43
LANGUAGE:=-std=gnu11
44
44
FEATURES:=-D_FILE_OFFSET_BITS=64
45
45
htmldir:=man
46
 
version:=1.8.9
 
46
version:=1.8.8
47
47
SED:=sed
48
48
PKG_CONFIG?=pkg-config
49
49
 
282
282
                $@)
283
283
 
284
284
# Need to add the GnuTLS, Avahi and GPGME libraries
285
 
plugins.d/mandos-client: CFLAGS += $(GNUTLS_CFLAGS) $(strip \
286
 
        ) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
287
 
plugins.d/mandos-client: LDLIBS += $(GNUTLS_LIBS) $(strip \
288
 
        ) $(AVAHI_LIBS) $(GPGME_LIBS)
 
285
plugins.d/mandos-client: plugins.d/mandos-client.c
 
286
        $(LINK.c) $^ $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(strip\
 
287
                ) $(GPGME_CFLAGS) $(GNUTLS_LIBS) $(strip\
 
288
                ) $(AVAHI_LIBS) $(GPGME_LIBS) $(LOADLIBES) $(strip\
 
289
                ) $(LDLIBS) -o $@
289
290
 
290
291
# Need to add the libnl-route library
291
 
plugin-helpers/mandos-client-iprouteadddel: CFLAGS += $(LIBNL3_CFLAGS)
292
 
plugin-helpers/mandos-client-iprouteadddel: LDLIBS += $(LIBNL3_LIBS)
 
292
plugin-helpers/mandos-client-iprouteadddel: plugin-helpers/mandos-client-iprouteadddel.c
 
293
        $(LINK.c) $(LIBNL3_CFLAGS) $^ $(LIBNL3_LIBS) $(strip\
 
294
                ) $(LOADLIBES) $(LDLIBS) -o $@
293
295
 
294
296
# Need to add the GLib and pthread libraries
295
 
dracut-module/password-agent: CFLAGS += $(GLIB_CFLAGS)
296
 
dracut-module/password-agent: LDLIBS += $(GLIB_LIBS) -lpthread
 
297
dracut-module/password-agent: dracut-module/password-agent.c
 
298
        $(LINK.c) $(GLIB_CFLAGS) $^ $(GLIB_LIBS) -lpthread $(strip\
 
299
                ) $(LOADLIBES) $(LDLIBS) -o $@
297
300
 
298
301
.PHONY : all doc html clean distclean mostlyclean maintainer-clean \
299
302
        check run-client run-server install install-html \