DeforaNetworks/fwknop
DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Added AM_CONDITIONAL to check if OS is Darwin (Apple) and not use the --whole-archive option if it is.

Browse Source
This commit is contained in:
Damien Stuart 2015-11-02 23:02:22 -05:00
parent 0ef8ba5259
commit 02049cb473
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -120,6 +120,10 @@ AC_PROG_LN_S
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_LIBTOOL 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 Decide whether or not to build binaries with profiling coverage support
dnl dnl
want_profile_coverage=no want_profile_coverage=no

30
lib/Makefile.am
View File

@ -12,24 +12,28 @@ libfko_source_files = \
if WANT_C_UNIT_TESTS if WANT_C_UNIT_TESTS
libfko_la_LIBADD = $(top_builddir)/common/cunit_common.o libfko_la_LIBADD = $(top_builddir)/common/cunit_common.o
noinst_PROGRAMS = fko_utests noinst_PROGRAMS = fko_utests
fko_utests_SOURCES = fko_utests.c $(libfko_source_files) fko_utests_SOURCES = fko_utests.c $(libfko_source_files)
fko_utests_CPPFLAGS = -I $(top_builddir)/lib -I $(top_builddir)/common $(GPGME_CFLAGS) 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_LDADD = $(top_builddir)/lib/libfko.la $(top_builddir)/common/libfko_util.a
fko_utests_LDFLAGS = -lcunit $(GPGME_LIBS) fko_utests_LDFLAGS = -lcunit $(GPGME_LIBS)
libfko_la_LDFLAGS = -version-info 2:3:0 $(GPGME_LIBS) -export-symbols-regex '^fko_' libfko_la_LDFLAGS = -version-info 2:3:0 $(GPGME_LIBS) -export-symbols-regex '^fko_'
else else
libfko_la_LDFLAGS = -version-info 2:3:0 $(GPGME_LIBS) \ if APPLE_PLATFORM
-export-symbols-regex '^fko_' \ 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 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 endif
libfko_la_SOURCES = $(libfko_source_files) 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: clean-local:
rm -f fko_utests *.gcno *.gcda rm -f fko_utests *.gcno *.gcda