diff options
author | Pawel Kowalski <p.kowalski2@partner.samsung.com> | 2019-08-28 14:28:40 +0200 |
---|---|---|
committer | Pawel Kowalski <p.kowalski2@partner.samsung.com> | 2019-08-28 14:28:40 +0200 |
commit | 26bea900a531662c6028ecc06f4adea825658434 (patch) | |
tree | 1db3d30bddc8b8336fa7a8f2bf5a3615001071e1 /lib/Makefile.am | |
parent | e527f54afdf27ab8ce73a22d05d69e5482f5e92b (diff) | |
download | libtasn1-26bea900a531662c6028ecc06f4adea825658434.tar.gz libtasn1-26bea900a531662c6028ecc06f4adea825658434.tar.bz2 libtasn1-26bea900a531662c6028ecc06f4adea825658434.zip |
Imported Upstream version 4.14upstream/4.14
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 |