From adab8d5047f0f316dd9c04d33664bfbb6aa72559 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 27 Dec 2015 09:28:15 +0100 Subject: simplify dist. and inst. of headers Change-Id: Ie12aaf8c1fbb4241d0cb1d572d00662283ef2052 --- inc/libvisio/Makefile.am | 4 +++- src/lib/Makefile.am | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/inc/libvisio/Makefile.am b/inc/libvisio/Makefile.am index 16c458f..6b3c3eb 100644 --- a/inc/libvisio/Makefile.am +++ b/inc/libvisio/Makefile.am @@ -1,3 +1,5 @@ -EXTRA_DIST = \ +libvisiodir = $(includedir)/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@/libvisio + +dist_libvisio_HEADERS = \ libvisio.h \ VisioDocument.h diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 5442d99..f482b9f 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -5,10 +5,6 @@ version_info = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) endif lib_LTLIBRARIES = libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@.la -libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_includedir = $(includedir)/libvisio-@VSD_MAJOR_VERSION@.@VSD_MINOR_VERSION@/libvisio -libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_include_HEADERS = \ - $(top_srcdir)/inc/libvisio/libvisio.h \ - $(top_srcdir)/inc/libvisio/VisioDocument.h AM_CXXFLAGS = \ -DLIBVISIO_BUILD=1 \ -- cgit v1.2.3