build: More use of $(top_builddir)

diff --git a/src/doclets/devhelp/Makefile.am b/src/doclets/devhelp/Makefile.am
index de82ec1ed208301e212dcf6364aed6f97943d7c1..98d80b59618c5f99446d355d078911ac01ebc069 100644 (file)
--- a/src/doclets/devhelp/Makefile.am
+++ b/src/doclets/devhelp/Makefile.am
@@ -3,7 +3,7 @@ NULL =
 
 AM_CFLAGS =  -g \
        -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-       -I ../../libvaladoc/ \
+       -I $(top_builddir)/src/libvaladoc/ \
        $(LIBGVC_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(LIBGEE_CFLAGS) \
@@ -42,7 +42,7 @@ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
 
 
 libdoclet_la_LIBADD = \
-       ../../libvaladoc/libvaladoc.la \
+       $(top_builddir)/src/libvaladoc/libvaladoc.la \
        $(GLIB_LIBS) \
        $(LIBGEE_LIBS) \
        $(NULL)

diff --git a/src/doclets/gtkdoc/Makefile.am b/src/doclets/gtkdoc/Makefile.am
index 81e36075336fc0b1238f7c3a6334ac4d4e898196..ff1849c6adf83d68b7e2be023dd6b0ccb8a5ff0f 100644 (file)
--- a/src/doclets/gtkdoc/Makefile.am
+++ b/src/doclets/gtkdoc/Makefile.am
@@ -3,7 +3,7 @@ NULL =
 
 AM_CFLAGS =  -g \
        -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-       -I ../../libvaladoc/ \
+       -I $(top_builddir)/src/libvaladoc/ \
        $(GLIB_CFLAGS) \
        $(LIBGVC_CFLAGS) \
        $(LIBGEE_CFLAGS) \
@@ -47,7 +47,7 @@ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
 
 
 libdoclet_la_LIBADD = \
-       ../../libvaladoc/libvaladoc.la \
+       $(top_builddir)/src/libvaladoc/libvaladoc.la \
        $(GLIB_LIBS) \
        $(LIBGEE_LIBS) \
        $(NULL)

diff --git a/src/doclets/htm/Makefile.am b/src/doclets/htm/Makefile.am
index 7127e1d350d533cc6c85140fb4746f3b419781c3..fb8c96fc125455bfb3b4c65510d96a760458d725 100644 (file)
--- a/src/doclets/htm/Makefile.am
+++ b/src/doclets/htm/Makefile.am
@@ -3,7 +3,7 @@ NULL =
 
 AM_CFLAGS =  -g \
        -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-       -I ../../libvaladoc/ \
+       -I $(top_builddir)/src/libvaladoc/ \
        $(LIBGVC_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(LIBGEE_CFLAGS) \
@@ -52,7 +52,7 @@ libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
 
 
 libdoclet_la_LIBADD = \
-       ../../libvaladoc/libvaladoc.la \
+       $(top_builddir)/src/libvaladoc/libvaladoc.la \
        $(GLIB_LIBS) \
        $(LIBGEE_LIBS) \
        $(NULL)

diff --git a/src/valadoc/Makefile.am b/src/valadoc/Makefile.am
index 21013f5f96c177ba80c530f4eab2a67ee92645f0..5387f38caa0cb5834da0a9c6aa1ed6ae85748507 100644 (file)
--- a/src/valadoc/Makefile.am
+++ b/src/valadoc/Makefile.am
@@ -7,7 +7,7 @@ AM_CFLAGS =                                 \
        -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
        -DPACKAGE_VERSION=\"$(VERSION)\"        \
        -DDEFAULT_DRIVER=\"$(DEFAULT_DRIVER)\"         \
-       -I ../libvaladoc/                       \
+       -I $(top_builddir)/src/libvaladoc/                       \
        $(GLIB_CFLAGS)                          \
        $(LIBGEE_CFLAGS)                        \
        $(GMODULE_CFLAGS)                       \
@@ -32,7 +32,7 @@ valadoc_SOURCES = \
 
 
 valadoc_LDADD =                 \
-       ../libvaladoc/libvaladoc.la \
+       $(top_builddir)/src/libvaladoc/libvaladoc.la \
        $(GLIB_LIBS)                \
        $(GMODULE_LIBS)             \
        $(LIBGVC_LIBS)              \
@@ -41,7 +41,7 @@ valadoc_LDADD =                 \
 
 
 valadoc.vala.stamp: $(valadoc_VALASOURCES)
-       $(VALAC) -C --pkg config --pkg gee-0.8 --pkg gmodule-2.0 --vapidir $(top_srcdir)/src/vapi/ --vapidir ../libvaladoc/ --pkg valadoc-1.0 $^
+       $(VALAC) -C --pkg config --pkg gee-0.8 --pkg gmodule-2.0 --vapidir $(top_srcdir)/src/vapi/ --vapidir $(top_builddir)/src/libvaladoc/ --pkg valadoc-1.0 $^
        touch $@