inc/libcdr/Makefile.am | 4 +++-
src/lib/Makefile.am | 6 ------
2 files changed, 3 insertions(+), 7 deletions(-)
New commits:
commit 8856825330f3a1fc4ef3fbf75c731158f3ea81ed
Author: David Tardon <dtar...@redhat.com>
Date: Mon Jan 1 13:54:35 2018 +0100
simplify dist and inst. of headers
Change-Id: I109e1b8ec3d1591aa9abe14cfedf05b0129104ad
diff --git a/inc/libcdr/Makefile.am b/inc/libcdr/Makefile.am
index 214dcd4..fc6d18c 100644
--- a/inc/libcdr/Makefile.am
+++ b/inc/libcdr/Makefile.am
@@ -1,4 +1,6 @@
-EXTRA_DIST = \
+libcdrdir =
$(includedir)/libcdr-$(CDR_MAJOR_VERSION).$(CDR_MINOR_VERSION)/libcdr
+
+dist_libcdr_HEADERS = \
libcdr.h \
libcdr_api.h \
CDRDocument.h \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index e14fa8c..2a44977 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -6,12 +6,6 @@ endif
noinst_LTLIBRARIES = libcdr-internal.la
lib_LTLIBRARIES = libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
-libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_includedir =
$(includedir)/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@/libcdr
-libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_include_HEADERS = \
- $(top_srcdir)/inc/libcdr/libcdr.h \
- $(top_srcdir)/inc/libcdr/libcdr_api.h \
- $(top_srcdir)/inc/libcdr/CDRDocument.h \
- $(top_srcdir)/inc/libcdr/CMXDocument.h
AM_CXXFLAGS = -I$(top_srcdir)/inc \
$(REVENGE_CFLAGS) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
