[valadoc] build: More use of $(top_builddir)



commit 1d0deee02e634a6c3602949f365cf22199bcdf07
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Mon Dec 23 17:34:13 2013 +0100

    build: More use of $(top_builddir)

 src/doclets/devhelp/Makefile.am |    4 ++--
 src/doclets/gtkdoc/Makefile.am  |    4 ++--
 src/doclets/htm/Makefile.am     |    4 ++--
 src/valadoc/Makefile.am         |    6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/doclets/devhelp/Makefile.am b/src/doclets/devhelp/Makefile.am
index de82ec1..98d80b5 100644
--- 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 81e3607..ff1849c 100644
--- 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 7127e1d..fb8c96f 100644
--- 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 21013f5..5387f38 100644
--- 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 $@
 
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]