DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/master' into cmd_open_close_cycle

Browse Source
This commit is contained in:
Michael Rash
2015-10-31 10:37:06 -07:00
parent 2101bd63e9 02049cb473
commit d3dcfc9cf4
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+4
View File
@@ -120,6 +120,10 @@ AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
dnl Detect if we are on and Apple platform
dnl
AM_CONDITIONAL([APPLE_PLATFORM], [test `uname -s` = Darwin])
dnl Decide whether or not to build binaries with profiling coverage support
dnl
want_profile_coverage=no
doc/gpl-2.0.texi
+3
View File
@@ -293,6 +293,8 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
@end enumerate
@iftex
@heading NO WARRANTY
@end iftex
@@ -301,6 +303,7 @@ of promoting the sharing and reuse of software generally.
@end ifinfo
@enumerate
@item
BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
lib/Makefile.am
+18 -10
View File
@@ -12,20 +12,28 @@ libfko_source_files = \
if WANT_C_UNIT_TESTS
libfko_la_LIBADD = $(top_builddir)/common/cunit_common.o
noinst_PROGRAMS = fko_utests
fko_utests_SOURCES = fko_utests.c $(libfko_source_files)
fko_utests_CPPFLAGS = -I $(top_builddir)/lib -I $(top_builddir)/common $(GPGME_CFLAGS)
fko_utests_LDADD = $(top_builddir)/lib/libfko.la $(top_builddir)/common/libfko_util.a
fko_utests_LDFLAGS = -lcunit $(GPGME_LIBS)
libfko_la_LIBADD = $(top_builddir)/common/cunit_common.o
noinst_PROGRAMS = fko_utests
fko_utests_SOURCES = fko_utests.c $(libfko_source_files)
fko_utests_CPPFLAGS = -I $(top_builddir)/lib -I $(top_builddir)/common $(GPGME_CFLAGS)
fko_utests_LDADD = $(top_builddir)/lib/libfko.la $(top_builddir)/common/libfko_util.a
fko_utests_LDFLAGS = -lcunit $(GPGME_LIBS)
libfko_la_LDFLAGS = -version-info 2:3:0 $(GPGME_LIBS) -export-symbols-regex '^fko_'
else
if APPLE_PLATFORM
libfko_la_LDFLAGS = -version-info 2:3:0 $(GPGME_LIBS) -export-symbols-regex '^fko_'
else
libfko_la_LDFLAGS = -version-info 2:3:0 $(GPGME_LIBS) \
-export-symbols-regex '^fko_' \
-Wl,--whole-archive,$(top_builddir)/common/libfko_util.a,--no-whole-archive
endif
endif
libfko_la_SOURCES = $(libfko_source_files)
libfko_la_LDFLAGS = -version-info 2:3:0 $(GPGME_LIBS) -export-symbols-regex '^fko_'
libfko_la_SOURCES = $(libfko_source_files)
AM_CPPFLAGS = $(GPGME_CFLAGS) -I $(top_srcdir)/common
AM_CPPFLAGS = $(GPGME_CFLAGS) -I $(top_srcdir)/common
include_HEADERS = fko.h
include_HEADERS = fko.h
clean-local:
rm -f fko_utests *.gcno *.gcda