diff options
| author | Pawel Kowalski <p.kowalski2@partner.samsung.com> | 2019-08-28 14:31:23 +0200 |
|---|---|---|
| committer | Pawel Kowalski <p.kowalski2@partner.samsung.com> | 2019-08-28 16:56:31 +0200 |
| commit | dee455252ad321c660b411b4ecd65aa5e08f8fc1 (patch) | |
| tree | b55f9ec039e963e42605e9e9bdc186354cf9df42 /lib/Makefile.am | |
| parent | 5c7e0aaf17a296535495e3431db6a86ad64064b3 (diff) | |
| parent | 26bea900a531662c6028ecc06f4adea825658434 (diff) | |
| download | libtasn1-dee455252ad321c660b411b4ecd65aa5e08f8fc1.tar.gz libtasn1-dee455252ad321c660b411b4ecd65aa5e08f8fc1.tar.bz2 libtasn1-dee455252ad321c660b411b4ecd65aa5e08f8fc1.zip | |
Merge tag 'upstream/4.14' into tizentizen_6.5.m2_releasetizen_6.0.m2_releasetizen_5.5.m2_releasesubmit/tizen_6.5/20211028.163501submit/tizen_6.0_hotfix/20201103.115102submit/tizen_6.0_hotfix/20201102.192902submit/tizen_6.0/20201029.205502submit/tizen_5.5_wearable_hotfix/20201026.184307submit/tizen_5.5_mobile_hotfix/20201026.185107submit/tizen_5.5/20191031.000007submit/tizen/20190904.070216submit/tizen/20190829.061506accepted/tizen/unified/20190904.110630accepted/tizen/6.5/unified/20211029.014057accepted/tizen/6.0/unified/hotfix/20201103.050702accepted/tizen/6.0/unified/hotfix/20201102.234932accepted/tizen/6.0/unified/20201030.110146accepted/tizen/5.5/unified/wearable/hotfix/20201027.100357accepted/tizen/5.5/unified/mobile/hotfix/20201027.074057accepted/tizen/5.5/unified/20191031.011500tizen_6.5tizen_6.0_hotfixtizen_6.0tizen_5.5_wearable_hotfixtizen_5.5_tvtizen_5.5_mobile_hotfixtizen_5.5accepted/tizen_6.5_unifiedaccepted/tizen_6.0_unified_hotfixaccepted/tizen_6.0_unifiedaccepted/tizen_5.5_unified_wearable_hotfixaccepted/tizen_5.5_unified_mobile_hotfixaccepted/tizen_5.5_unified
Change-Id: I6d4b47b2072db8e7c45daa6e269e2f0cc6f54a7f
Diffstat (limited to 'lib/Makefile.am')
| -rw-r--r-- | lib/Makefile.am | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 8b6a0f0..9f11955 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -16,12 +16,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -SUBDIRS = gllib +SUBDIRS = gl -AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAG_VISIBILITY) -AM_CPPFLAGS = -I$(srcdir)/gllib -DASN1_BUILDING +AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAG_VISIBILITY) $(CODE_COVERAGE_CFLAGS) +AM_CPPFLAGS = -I$(builddir)/gl -I$(srcdir)/gl -I$(builddir)/includes -I$(srcdir)/includes\ + -DASN1_BUILDING $(CODE_COVERAGE_CPPFLAGS) -include_HEADERS = libtasn1.h +include_HEADERS = includes/libtasn1.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libtasn1.pc @@ -38,7 +39,7 @@ libtasn1_la_SOURCES = \ gstr.c \ gstr.h \ int.h \ - libtasn1.h \ + includes/libtasn1.h \ libtasn1.map \ parser_aux.c \ parser_aux.h \ @@ -46,11 +47,12 @@ libtasn1_la_SOURCES = \ structure.h \ version.c -libtasn1_la_LIBADD = gllib/libgnu.la +libtasn1_la_LIBADD = gl/libgnu.la libtasn1_la_LDFLAGS = \ -no-undefined \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + $(CODE_COVERAGE_LDFLAGS) if HAVE_LD_VERSION_SCRIPT libtasn1_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libtasn1.map |