diff options
author | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:24:08 +0900 |
---|---|---|
committer | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:25:02 +0900 |
commit | 8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8 (patch) | |
tree | 81f0750d91aa467df3ee81cf30d22a65db2e6685 /Makefile.am | |
parent | ccccebb78520ec3a26a18370936516b12ae5d53a (diff) | |
parent | 45e88a8337839e5fd88519bc55467053d521c9f6 (diff) | |
download | c-ares-accepted/tizen/4.0/base/20170828.221324.tar.gz c-ares-accepted/tizen/4.0/base/20170828.221324.tar.bz2 c-ares-accepted/tizen/4.0/base/20170828.221324.zip |
Merge branch 'tizen' into tizen_basetizen_4.0.m2_releasetizen_4.0.IoT.p1_releasesubmit/tizen_base/20170705.023439submit/tizen_base/20170703.013654submit/tizen_4.0_base/20170828.000001submit/tizen_4.0_base/20170828.000000submit/tizen_4.0_base/20170811.071500accepted/tizen/base/20170707.183634accepted/tizen/4.0/base/20170828.221324accepted/tizen/4.0/base/20170811.093019
Conflicts:
packaging/c-ares.spec
Change-Id: I1ec10e394aed3ef19ee21fefbe3aba7d7a615c74
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 23059a1..d49d445 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,16 +55,19 @@ EXTRA_DIST = AUTHORS CHANGES README.cares Makefile.inc Makefile.dj \ Makefile.m32 Makefile.netware Makefile.msvc Makefile.Watcom $(man_MANS) \ config-win32.h RELEASE-NOTES libcares.pc.in buildconf get_ver.awk maketgz \ TODO ares_build.h.in $(PDFPAGES) cares.rc README.msvc $(MSVCFILES) \ - $(CSOURCES) $(HHEADERS) config-dos.h acountry.1 adig.1 ahost.1 INSTALL + $(CSOURCES) $(HHEADERS) config-dos.h acountry.1 adig.1 ahost.1 INSTALL \ + README.md LICENSE.md CLEANFILES = $(PDFPAGES) $(HTMLPAGES) DISTCLEANFILES = ares_build.h +#DIST_SUBDIRS = test + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcares.pc -CARES_VERSION_INFO = -version-info 3:0:1 +CARES_VERSION_INFO = -version-info 4:0:2 # This flag accepts an argument of the form current[:revision[:age]]. So, # passing -version-info 3:12:1 sets current to 3, revision to 12, and age to # 1. @@ -127,6 +130,10 @@ libcares_la_CFLAGS_EXTRA += $(CFLAG_CARES_SYMBOL_HIDING) libcares_la_CPPFLAGS_EXTRA += -DCARES_SYMBOL_HIDING endif +@CODE_COVERAGE_RULES@ +libcares_la_LDFLAGS += $(CODE_COVERAGE_LDFLAGS) +libcares_la_CFLAGS_EXTRA += $(CODE_COVERAGE_CFLAGS) + libcares_la_CFLAGS = $(AM_CFLAGS) $(libcares_la_CFLAGS_EXTRA) libcares_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcares_la_CPPFLAGS_EXTRA) |