You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
213 lines
6.0 KiB
213 lines
6.0 KiB
From 3dc5768c045c400ff522b8a510b789001aa93df4 Mon Sep 17 00:00:00 2001
|
|
From: Gilles Dartiguelongue <eva@gentoo.org>
|
|
Date: Fri, 4 Jan 2019 11:31:14 +0100
|
|
Subject: [PATCH 2/2] Make valadoc doclets & data parallel installable
|
|
|
|
---
|
|
libvaladoc/Makefile.am | 12 ++++++++++--
|
|
valadoc/Makefile.am | 7 ++++++-
|
|
valadoc/doclets/devhelp/Makefile.am | 11 ++++++++---
|
|
valadoc/doclets/gtkdoc/Makefile.am | 11 ++++++++---
|
|
valadoc/doclets/html/Makefile.am | 11 ++++++++---
|
|
valadoc/icons/Makefile.am | 4 ++++
|
|
valadoc/tests/Makefile.am | 7 ++++++-
|
|
7 files changed, 50 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
|
|
index f3f790e76..86875631b 100644
|
|
--- a/libvaladoc/Makefile.am
|
|
+++ b/libvaladoc/Makefile.am
|
|
@@ -3,8 +3,6 @@ include $(top_srcdir)/Makefile.common
|
|
NULL =
|
|
|
|
AM_CFLAGS = \
|
|
- -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
|
|
- -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
|
|
-DPACKAGE_VERSION=\"$(VERSION)\" \
|
|
$(COVERAGE_CFLAGS) \
|
|
$(LIBGVC_CFLAGS) \
|
|
@@ -16,6 +14,16 @@ AM_CFLAGS = \
|
|
-I$(top_srcdir)/codegen \
|
|
$(NULL)
|
|
|
|
+if ENABLE_UNVERSIONED
|
|
+AM_CFLAGS += \
|
|
+ -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
|
|
+ -DPACKAGE_DATADIR=\"$(libdir)/valadoc\"
|
|
+else
|
|
+AM_CFLAGS += \
|
|
+ -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" \
|
|
+ -DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\"
|
|
+endif
|
|
+
|
|
AM_VALAFLAGS = \
|
|
$(NULL)
|
|
|
|
diff --git a/valadoc/Makefile.am b/valadoc/Makefile.am
|
|
index 33f3a9375..2f3dec848 100644
|
|
--- a/valadoc/Makefile.am
|
|
+++ b/valadoc/Makefile.am
|
|
@@ -9,7 +9,6 @@ SUBDIRS = \
|
|
$(NULL)
|
|
|
|
AM_CFLAGS = \
|
|
- -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
|
|
-DPACKAGE_VERSION=\"$(VERSION)\" \
|
|
-I$(top_srcdir)/libvaladoc/ \
|
|
-I$(top_srcdir)/gee \
|
|
@@ -22,6 +21,12 @@ AM_CFLAGS = \
|
|
$(LIBGVC_CFLAGS) \
|
|
$(NULL)
|
|
|
|
+if ENABLE_UNVERSIONED
|
|
+AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc\"
|
|
+else
|
|
+AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\"
|
|
+endif
|
|
+
|
|
BUILT_SOURCES = valadoc.vala.stamp
|
|
|
|
bin_PROGRAMS = valadoc
|
|
diff --git a/valadoc/doclets/devhelp/Makefile.am b/valadoc/doclets/devhelp/Makefile.am
|
|
index 5783c0b5a..afbb8f7f9 100644
|
|
--- a/valadoc/doclets/devhelp/Makefile.am
|
|
+++ b/valadoc/doclets/devhelp/Makefile.am
|
|
@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common
|
|
NULL =
|
|
|
|
AM_CFLAGS = \
|
|
- -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
|
|
-I$(top_srcdir)/gee/ \
|
|
-I$(top_srcdir)/vala/ \
|
|
-I$(top_srcdir)/libvaladoc/ \
|
|
@@ -12,12 +11,18 @@ AM_CFLAGS = \
|
|
$(LIBGVC_CFLAGS) \
|
|
$(NULL)
|
|
|
|
+if ENABLE_UNVERSIONED
|
|
+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\"
|
|
+docletdir = $(libdir)/valadoc/doclets/devhelp
|
|
+else
|
|
+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\"
|
|
+docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/devhelp
|
|
+endif
|
|
+
|
|
BUILT_SOURCES = libdoclet.vala.stamp
|
|
|
|
doclet_LTLIBRARIES = libdoclet.la
|
|
|
|
-docletdir = $(libdir)/valadoc/doclets/devhelp
|
|
-
|
|
libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
|
|
|
|
libdoclet_la_VALASOURCES = \
|
|
diff --git a/valadoc/doclets/gtkdoc/Makefile.am b/valadoc/doclets/gtkdoc/Makefile.am
|
|
index 763e46932..f689018ce 100644
|
|
--- a/valadoc/doclets/gtkdoc/Makefile.am
|
|
+++ b/valadoc/doclets/gtkdoc/Makefile.am
|
|
@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common
|
|
NULL =
|
|
|
|
AM_CFLAGS = \
|
|
- -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
|
|
-I$(top_srcdir)/gee/ \
|
|
-I$(top_srcdir)/vala/ \
|
|
-I$(top_srcdir)/libvaladoc/ \
|
|
@@ -12,12 +11,18 @@ AM_CFLAGS = \
|
|
$(LIBGVC_CFLAGS) \
|
|
$(NULL)
|
|
|
|
+if ENABLE_UNVERSIONED
|
|
+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\"
|
|
+docletdir = $(libdir)/valadoc/doclets/gtkdoc
|
|
+else
|
|
+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\"
|
|
+docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/gtkdoc
|
|
+endif
|
|
+
|
|
BUILT_SOURCES = libdoclet.vala.stamp
|
|
|
|
doclet_LTLIBRARIES = libdoclet.la
|
|
|
|
-docletdir = $(libdir)/valadoc/doclets/gtkdoc
|
|
-
|
|
libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
|
|
|
|
libdoclet_la_VALASOURCES = \
|
|
diff --git a/valadoc/doclets/html/Makefile.am b/valadoc/doclets/html/Makefile.am
|
|
index 885fbfbab..855184020 100644
|
|
--- a/valadoc/doclets/html/Makefile.am
|
|
+++ b/valadoc/doclets/html/Makefile.am
|
|
@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common
|
|
NULL =
|
|
|
|
AM_CFLAGS = \
|
|
- -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
|
|
-I$(top_srcdir)/gee/ \
|
|
-I$(top_srcdir)/vala/ \
|
|
-I$(top_srcdir)/libvaladoc/ \
|
|
@@ -12,12 +11,18 @@ AM_CFLAGS = \
|
|
$(LIBGVC_CFLAGS) \
|
|
$(NULL)
|
|
|
|
+if ENABLE_UNVERSIONED
|
|
+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\"
|
|
+docletdir = $(libdir)/valadoc/doclets/html
|
|
+else
|
|
+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\"
|
|
+docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/html
|
|
+endif
|
|
+
|
|
BUILT_SOURCES = libdoclet.vala.stamp
|
|
|
|
doclet_LTLIBRARIES = libdoclet.la
|
|
|
|
-docletdir = $(libdir)/valadoc/doclets/html
|
|
-
|
|
libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
|
|
|
|
libdoclet_la_VALASOURCES = \
|
|
diff --git a/valadoc/icons/Makefile.am b/valadoc/icons/Makefile.am
|
|
index 454bdba7c..668956f3b 100644
|
|
--- a/valadoc/icons/Makefile.am
|
|
+++ b/valadoc/icons/Makefile.am
|
|
@@ -1,6 +1,10 @@
|
|
NULL =
|
|
|
|
+if ENABLE_UNVERSIONED
|
|
iconsdir = $(datadir)/valadoc/icons
|
|
+else
|
|
+iconsdir = $(datadir)/valadoc@PACKAGE_SUFFIX@/icons
|
|
+endif
|
|
|
|
dist_icons_DATA = \
|
|
abstractclass.png \
|
|
diff --git a/valadoc/tests/Makefile.am b/valadoc/tests/Makefile.am
|
|
index e40cc1ca3..2bca58128 100644
|
|
--- a/valadoc/tests/Makefile.am
|
|
+++ b/valadoc/tests/Makefile.am
|
|
@@ -22,7 +22,6 @@ check-TESTS: $(TESTS)
|
|
G_DEBUG=fatal_warnings $(builddir)/driver
|
|
|
|
AM_CFLAGS = \
|
|
- -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
|
|
-DPACKAGE_VERSION=\"$(VERSION)\" \
|
|
-DTOP_SRC_DIR=\"$(abs_top_srcdir)\" \
|
|
-I$(top_srcdir)/libvaladoc/ \
|
|
@@ -36,6 +35,12 @@ AM_CFLAGS = \
|
|
$(LIBGVC_CFLAGS) \
|
|
$(NULL)
|
|
|
|
+if ENABLE_UNVERSIONED
|
|
+AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc\"
|
|
+else
|
|
+AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\"
|
|
+endif
|
|
+
|
|
BUILT_SOURCES = driver.vala.stamp
|
|
|
|
check_PROGRAMS = driver
|
|
--
|
|
2.20.1
|
|
|