Fix out of tree build

This fixes a few occurrences where files are incorrectly referenced from
the build directory instead of the source directory, therefore causing
breakage when building out of tree.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4cba357..037890b 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -136,8 +136,8 @@ $(gdoc_MANS) $(gdoc_TEXINFOS):
 GDOC_SRC = $(top_srcdir)/lib/decoding.c $(top_srcdir)/lib/errors.c     \
        $(top_srcdir)/lib/parser_aux.c $(top_srcdir)/lib/coding.c       \
        $(top_srcdir)/lib/element.c $(top_srcdir)/lib/gstr.c            \
-       $(top_srcdir)/lib/structure.c $(top_builddir)/lib/ASN1.c        \
-       $(top_builddir)/lib/version.c
+       $(top_srcdir)/lib/structure.c $(top_srcdir)/lib/ASN1.c          \
+       $(top_srcdir)/lib/version.c
 
 update-makefile:
        @MANS=""; \

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 044f72d..2ea4c09 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -19,7 +19,7 @@
 SUBDIRS = gllib
 
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAG_VISIBILITY)
-AM_CPPFLAGS = -I$(builddir)/gllib -DASN1_BUILDING
+AM_CPPFLAGS = -I$(srcdir)/gllib -DASN1_BUILDING
 
 include_HEADERS = libtasn1.h