Skip to content
Permalink
Browse files
valadoc: Install icons and doclets to API dependent folders
This allows to co-install different valadoc versions as for the compiler.
  • Loading branch information
leio authored and ricotz committed Aug 4, 2019
1 parent ca5d2b7 commit da7085811b75f589619e2e349ba5b4d2e2bd2b38
@@ -33,6 +33,8 @@ program_transform_name="s,\$\$,${PACKAGE_SUFFIX},"

AC_SUBST(pkgdatadir, [${datadir}/vala${PACKAGE_SUFFIX}])
AC_SUBST(pkglibdir, [${libdir}/vala${PACKAGE_SUFFIX}])
AC_SUBST(pkgdocdatadir, [${datadir}/valadoc${PACKAGE_SUFFIX}])
AC_SUBST(pkgdoclibdir, [${libdir}/valadoc${PACKAGE_SUFFIX}])

# Checks for programs.
AC_PROG_CC
@@ -4,7 +4,7 @@ NULL =

AM_CFLAGS = \
-DG_LOG_DOMAIN=\"valadoc\" \
-DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc\" \
-DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\" \
-DPACKAGE_VERSION=\"$(VERSION)\" \
$(COVERAGE_CFLAGS) \
$(LIBGVC_CFLAGS) \
@@ -4,6 +4,8 @@ libdir=@libdir@
includedir=@includedir@
datarootdir=@datarootdir@
datadir=@datadir@
pkgdatadir=@pkgdocdatadir@
pkglibdir=@pkgdoclibdir@
vapidir=@datadir@/vala/vapi

Name: Valadoc
@@ -10,7 +10,7 @@ SUBDIRS = \

AM_CFLAGS = \
-DG_LOG_DOMAIN=\"valadoc\" \
-DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc\" \
-DPACKAGE_VALADOC_LIBDIR=\"$(pkgdoclibdir)\" \
-DPACKAGE_VERSION=\"$(VERSION)\" \
-I$(top_srcdir)/libvaladoc/ \
-I$(top_srcdir)/gee \
@@ -4,7 +4,7 @@ NULL =

AM_CFLAGS = \
-DG_LOG_DOMAIN=\"valadoc-devhelp\" \
-DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" \
-I$(top_srcdir)/gee/ \
-I$(top_srcdir)/vala/ \
-I$(top_srcdir)/libvaladoc/ \
@@ -17,7 +17,7 @@ BUILT_SOURCES = libdoclet.vala.stamp

doclet_LTLIBRARIES = libdoclet.la

docletdir = $(libdir)/valadoc/doclets/devhelp
docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/devhelp

libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined

@@ -4,7 +4,7 @@ NULL =

AM_CFLAGS = \
-DG_LOG_DOMAIN=\"valadoc-gtkdoc\" \
-DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" \
-I$(top_srcdir)/gee/ \
-I$(top_srcdir)/vala/ \
-I$(top_srcdir)/libvaladoc/ \
@@ -17,7 +17,7 @@ BUILT_SOURCES = libdoclet.vala.stamp

doclet_LTLIBRARIES = libdoclet.la

docletdir = $(libdir)/valadoc/doclets/gtkdoc
docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/gtkdoc

libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined

@@ -4,7 +4,7 @@ NULL =

AM_CFLAGS = \
-DG_LOG_DOMAIN=\"valadoc-html\" \
-DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-DPACKAGE_VALADOC_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" \
-I$(top_srcdir)/gee/ \
-I$(top_srcdir)/vala/ \
-I$(top_srcdir)/libvaladoc/ \
@@ -17,7 +17,7 @@ BUILT_SOURCES = libdoclet.vala.stamp

doclet_LTLIBRARIES = libdoclet.la

docletdir = $(libdir)/valadoc/doclets/html
docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/html

libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined

@@ -1,6 +1,6 @@
NULL =

iconsdir = $(datadir)/valadoc/icons
iconsdir = $(datadir)/valadoc@PACKAGE_SUFFIX@/icons

dist_icons_DATA = \
abstractclass.png \
@@ -22,7 +22,7 @@ check-TESTS: $(TESTS)
G_DEBUG=fatal_warnings $(builddir)/driver

AM_CFLAGS = \
-DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc\" \
-DPACKAGE_VALADOC_LIBDIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\" \
-DPACKAGE_VERSION=\"$(VERSION)\" \
-DTOP_SRC_DIR=\"$(abs_top_srcdir)\" \
-I$(top_srcdir)/libvaladoc/ \

0 comments on commit da70858

Please sign in to comment.