Put headers in include/libabigail
* include/libabigail: New directory. * include/Makefile.am: New file. * include/libabigail/Makefile.am: New file. * src/abg-*.h: Move these in include/libabigail/*.h * src/Makefile.am: Set -I option to look for headers in include/libabigail * doc/api/libabigail.doxy: Look for headers in include/libabigail * tests/Makefile.am: Set -I option to look for headers in include/libabigail * abigail.m4: Set includedir to $prefix/include/libabigail for library used as a dep, or to srcdir/libabigail/include/libabigail in GCC source tree. * configure.ac: Add Makefile.am in include and include/libabigail * abigail.m4: Look for headers in include/libabigail when the libabigail is in in the source tree and in $incdir/libabigail when it is installed as a dependency.
This commit is contained in:
parent
8e950513b0
commit
f9d66af03c
|
@ -1,4 +1,4 @@
|
|||
SUBDIRS = src tests doc
|
||||
SUBDIRS = include src tests doc
|
||||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
headers = config.h
|
||||
|
||||
|
|
|
@ -101,7 +101,7 @@ AC_DEFUN([ABIGAIL_INIT],
|
|||
if test -d $srcdir/libabigail -a -f $srcdir/gcc/gcc.c; then
|
||||
libpath='$$r/$(HOST_SUBDIR)/libabigail/src/'"${lt_cv_objdir}"
|
||||
abigaillibs="-L$libpath ${abigaillibs}"
|
||||
abigailinc='-I${srcdir}/libabigail/src '"${abigailinc}"
|
||||
abigailinc='-I${srcdir}/libabigail/include '"${abigailinc}"
|
||||
found_abigail_lib=yes
|
||||
found_abigail_inc=yes
|
||||
HAVE_LIBABIGAIL=yes
|
||||
|
|
|
@ -54,9 +54,11 @@ if test x$ABIGAIL_DEVEL != x; then
|
|||
fi
|
||||
|
||||
AC_CONFIG_FILES([Makefile
|
||||
include/Makefile
|
||||
include/libabigail/Makefile
|
||||
doc/Makefile
|
||||
src/Makefile
|
||||
tests/Makefile])
|
||||
AC_CONFIG_FILES([src/abg-version.h])
|
||||
AC_CONFIG_FILES([include/libabigail/abg-version.h])
|
||||
|
||||
AC_OUTPUT
|
||||
|
|
|
@ -683,7 +683,7 @@ WARN_LOGFILE =
|
|||
# directories like "/usr/src/myproject". Separate the files or directories
|
||||
# with spaces.
|
||||
|
||||
INPUT = LIBABIGAIL_INPUT/src
|
||||
INPUT = LIBABIGAIL_INPUT/src LIBABIGAIL_INPUT/include/libabigail
|
||||
|
||||
# This tag can be used to specify the character encoding of the source files
|
||||
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
SUBDIRS = libabigail
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
headers = \
|
||||
abg-ir.h \
|
||||
abg-reader.h \
|
||||
abg-corpus.h \
|
||||
abg-libxml-utils.h \
|
||||
abg-hash.h \
|
||||
abg-writer.h \
|
||||
abg-config.h \
|
||||
abg-version.h \
|
||||
abg-viz-common.h \
|
||||
abg-viz-dot.h \
|
||||
abg-viz-svg.h
|
||||
|
||||
publicheaders_DATA=$(headers)
|
||||
publicheadersdir=$(includedir)/libabigail
|
||||
|
|
@ -1,19 +1,6 @@
|
|||
libabigail_LTLIBRARIES=libabigail.la
|
||||
libabigaildir=$(libdir)/
|
||||
|
||||
headers = \
|
||||
abg-ir.h \
|
||||
abg-reader.h \
|
||||
abg-corpus.h \
|
||||
abg-libxml-utils.h \
|
||||
abg-hash.h \
|
||||
abg-writer.h \
|
||||
abg-config.h \
|
||||
abg-version.h \
|
||||
abg-viz-common.h \
|
||||
abg-viz-dot.h \
|
||||
abg-viz-svg.h
|
||||
|
||||
libabigail_la_SOURCES = $(headers) \
|
||||
abg-ir.cc \
|
||||
abg-reader.cc \
|
||||
|
@ -28,8 +15,5 @@ abg-viz-svg.cc
|
|||
|
||||
libabigail_la_LDFLAGS=@XML_LIBS@ -Wl,--as-needed
|
||||
|
||||
publicheaders_DATA=$(headers)
|
||||
publicheadersdir=$(includedir)/libabigail
|
||||
|
||||
AM_CPPFLAGS=@XML_CFLAGS@ -Wall
|
||||
AM_CPPFLAGS=@XML_CFLAGS@ -Wall -I$(top_srcdir)/include/libabigail -I$(top_builddir)/include/libabigail
|
||||
AM_CXXFLAGS="-std=gnu++11"
|
||||
|
|
|
@ -24,7 +24,7 @@ runtestsvg_LDADD=$(top_builddir)/src/libabigail.la
|
|||
runtestdot_SOURCES=test-dot.cc
|
||||
runtestdot_LDADD=$(top_builddir)/src/libabigail.la
|
||||
|
||||
AM_CPPFLAGS=-I${top_srcdir}/src
|
||||
AM_CPPFLAGS=-I${top_srcdir}/include/libabigail -I${top_builddir}/include/libabigail
|
||||
AM_CXXFLAGS="-std=gnu++11"
|
||||
|
||||
EXTRA_DIST= \
|
||||
|
|
Loading…
Reference in New Issue