From: yselkowitz <yselkowitz@users.sourceforge.net>
Date: Thu, 11 Feb 2010 23:06:14 +0000 (+0100)
Subject: several build fixes
X-Git-Tag: 0.37.1~3^2~488
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=487ea46f05f538920a6ed3a43f5d43095ea219cd;p=thirdparty%2Fvala.git

several build fixes
---

diff --git a/src/doclets/devhelp/Makefile.am b/src/doclets/devhelp/Makefile.am
index a4bd233ff..6fb7847cd 100644
--- a/src/doclets/devhelp/Makefile.am
+++ b/src/doclets/devhelp/Makefile.am
@@ -17,6 +17,9 @@ BUILT_SOURCES = libdoclet.vala.stamp
 docletdir = $(libdir)/valadoc/plugins/devhelp
 
 
+libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
+
+
 doclet_LTLIBRARIES =  \
 	libdoclet.la \
 	$(NULL)
@@ -34,7 +37,7 @@ libdoclet_la_SOURCES =      \
 
 
 libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
-	$(VALAC) -C --vapidir ../../vapi --vapidir ../../libvaladoc --pkg valadoc-1.0 --pkg gee-1.0 --basedir . $^
+	$(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/vapi/libvaladoc --pkg vala-1.0 --pkg gee-1.0 --pkg valadoc-1.0 --basedir . $^
 	touch $@
 
 
diff --git a/src/doclets/htm/Makefile.am b/src/doclets/htm/Makefile.am
index bd6630a15..4177352cb 100644
--- a/src/doclets/htm/Makefile.am
+++ b/src/doclets/htm/Makefile.am
@@ -17,7 +17,7 @@ BUILT_SOURCES = libdoclet.vala.stamp
 docletdir = $(libdir)/valadoc/plugins/html
 
 
-libdoclet_la_LDFLAGS = -module -avoid-version
+libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
 
 
 doclet_LTLIBRARIES =  \
@@ -37,7 +37,7 @@ libdoclet_la_SOURCES =  \
 
 
 libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
-	$(VALAC) -C --vapidir ../../vapi --vapidir ../../libvaladoc --pkg valadoc-1.0 --pkg gee-1.0 --basedir . $^
+	$(VALAC) -C --vapidir $(top_srcdir)/src/vapi --vapidir $(top_srcdir)/src/libvaladoc  --pkg vala-1.0 --pkg gee-1.0 --pkg valadoc-1.0 --basedir . $^
 	touch $@
 
 
diff --git a/src/doclets/valadoc.org/Makefile.am b/src/doclets/valadoc.org/Makefile.am
index e9006d227..ed8ec382a 100755
--- a/src/doclets/valadoc.org/Makefile.am
+++ b/src/doclets/valadoc.org/Makefile.am
@@ -11,7 +11,7 @@ BUILT_SOURCES = libdoclet.vala.stamp
 
 
 libdoclet.vala.stamp: $(libdoclet_VALASOURCES)
-	$(VALAC) -C --vapidir ../../libvaladoc/ --vapidir ../../vapi/ --pkg valadoc-1.0 --pkg gee-1.0 --basedir . --save-temps $^
+	$(VALAC) -C --vapidir $(top_srcdir)/src/libvaladoc/ --vapidir $(top_srcdir)/src/vapi/ --pkg vala-1.0 --pkg gee-1.0 --pkg valadoc-1.0 --basedir . --save-temps $^
 	touch $@
 
 
@@ -38,8 +38,7 @@ AM_CFLAGS =  -g \
 	$(NULL)
 
 
-libdoclet_la_LDFLAGS = -module -avoid-version \
-	$(NULL)
+libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
 
 
 libdoclet_la_LIBADD = \
diff --git a/src/doclets/xml/Makefile.am b/src/doclets/xml/Makefile.am
index da7528df0..344dcd814 100644
--- a/src/doclets/xml/Makefile.am
+++ b/src/doclets/xml/Makefile.am
@@ -12,7 +12,7 @@ BUILT_SOURCES = libdoclet.vala.stamp
 
 
 libdoclet.vala.stamp: $(libdoclet_VALASOURCES)
-	$(VALAC) -C --vapidir $(top_srcdir)/src/vapi/ --vapidir ../../libvaladoc --pkg valadoc-1.0 --pkg vala-1.0 --pkg gee-1.0 --basedir . --save-temps $^
+	$(VALAC) -C --vapidir $(top_srcdir)/src/vapi/ --vapidir $(top_srcdir)/src/libvaladoc --pkg valadoc-1.0 --pkg vala-1.0 --pkg gee-1.0 --basedir . --save-temps $^
 	touch $@
 
 
diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index 08dfaa6b3..4070c6e77 100644
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -17,12 +17,10 @@ AM_CFLAGS = \
 BUILT_SOURCES = libvaladoc.vala.stamp
 
 
-valadoc_LTLIBRARIES = \
+lib_LTLIBRARIES = \
 	libvaladoc.la     \
 	$(NULL)
 
-valadocdir = $(libdir)/valadoc
-
 
 libvaladoc_la_VALASOURCES = \
 	doclet.vala \
@@ -142,10 +140,13 @@ libvaladocincludedir = $(includedir)/
 
 
 libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)
-	$(VALAC) $(VALAFLAGS) -C -H valadoc-1.0.h --pkg gee-1.0 --pkg vala-1.0 --pkg gmodule-2.0 --vapidir ../vapi --pkg libgvc --pkg config --library valadoc-1.0 --basedir $(top_srcdir)/src/libvaladoc/ --save-temps $^
+	$(VALAC) $(VALAFLAGS) -C -H valadoc-1.0.h --pkg gee-1.0 --pkg vala-1.0 --pkg libgvc --pkg gmodule-2.0 --vapidir $(top_srcdir)/src/vapi --pkg libgvc --pkg config --library valadoc-1.0 --basedir $(top_srcdir)/src/libvaladoc/ --save-temps $^
 	touch $@
 
 
+libvaladoc_la_LDFLAGS = -no-undefined
+
+
 libvaladoc_la_LIBADD = \
 	$(LIBGVC_LIBS)     \
 	$(LIBGEE_LIBS)     \
diff --git a/src/libvaladoc/moduleloader.vala b/src/libvaladoc/moduleloader.vala
index 963f1258c..616a18932 100755
--- a/src/libvaladoc/moduleloader.vala
+++ b/src/libvaladoc/moduleloader.vala
@@ -20,7 +20,6 @@
  * 	Brosch Florian <flo.brosch@gmail.com>
  */
 
-using GLib.Path;
 using Gee;
 
 
@@ -51,7 +50,7 @@ public class Valadoc.ModuleLoader : Object {
 	private bool load_doclet (string path) {
 		void* function;
 
-		docletmodule = Module.open ( build_filename(path, "libdoclet.so"), ModuleFlags.BIND_LAZY);
+		docletmodule = Module.open (Module.build_path (path, "libdoclet"), ModuleFlags.BIND_LAZY);
 		if (docletmodule == null) {
 			return false;
 		}
diff --git a/src/valadoc/Makefile.am b/src/valadoc/Makefile.am
index 4759dec50..3a3500e4a 100644
--- a/src/valadoc/Makefile.am
+++ b/src/valadoc/Makefile.am
@@ -41,7 +41,7 @@ valadoc_LDADD =                 \
 
 
 valadoc.vala.stamp: $(valadoc_VALASOURCES)
-	$(VALAC) -C --pkg gee-1.0 --pkg gmodule-2.0 --vapidir ../vapi/ --pkg config --vapidir ../libvaladoc/ --pkg valadoc-1.0 $^
+	$(VALAC) -C --pkg config --pkg vala-1.0 --pkg gee-1.0 --pkg gmodule-2.0 --vapidir $(top_srcdir)/src/vapi/ --vapidir ../libvaladoc/ --pkg valadoc-1.0 $^
 	touch $@