From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Tue, 5 Aug 2003 19:39:26 +0000 (+0000)
Subject: exclude sample modules from compiling.
X-Git-Tag: v0.12.20~3323
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=94ec763790b1784412383217115ffacc6be8fa32;p=lttv.git

exclude sample modules from compiling.
modify sampledep to use required modules



git-svn-id: http://ltt.polymtl.ca/svn@166 04897980-b3bd-0310-b5e0-8ef037075253
---

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 92f31409..860c2940 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -60,7 +60,6 @@ AC_SUBST(lttincludedir)
 AC_CONFIG_FILES([Makefile
      lttv/Makefile
 		 lttv/modules/Makefile
-		 lttv/modules/examples/Makefile
 		 lttd/Makefile
 		 ltt/Makefile
 		 include/Makefile
@@ -68,6 +67,7 @@ AC_CONFIG_FILES([Makefile
 		 ltt/convert/Makefile
 		 include/lttv/Makefile])
 AC_OUTPUT
+#		 lttv/modules/examples/Makefile
 #		 include/ltt/convert/Makefile
 #		 lttv/modules/gui/API/Makefile
 #		 lttv/modules/gui/Makefile
diff --git a/ltt/branches/poly/lttv/modules/Makefile.am b/ltt/branches/poly/lttv/modules/Makefile.am
index 343d243e..10c3451a 100644
--- a/ltt/branches/poly/lttv/modules/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/Makefile.am
@@ -4,7 +4,7 @@
 # Created by Mathieu Desnoyers on May 6, 2003
 #
 
-SUBDIRS = examples coreGUI
+#SUBDIRS = examples
 
 libdir = ${lttvplugindir}
 
diff --git a/ltt/branches/poly/lttv/modules/examples/sampledep.c b/ltt/branches/poly/lttv/modules/examples/sampledep.c
index 805c5283..dd64c9f4 100644
--- a/ltt/branches/poly/lttv/modules/examples/sampledep.c
+++ b/ltt/branches/poly/lttv/modules/examples/sampledep.c
@@ -8,14 +8,13 @@
 /* Include module.h from lttv headers for module loading */
 #include <lttv/module.h>
 
-G_MODULE_EXPORT void init() {
+G_MODULE_EXPORT void init(int argc, char * argv[], LttvModule *self) {
 	g_critical("Sample module dependant init()");
 
-	lttv_module_load("samplemodule",0,NULL,DEPENDANT);
+	lttv_module_require(self, "samplemodule",argc,argv);
 }
 
 G_MODULE_EXPORT void destroy() {
 	g_critical("Sample module dependant destroy()");
-	lttv_module_unload_name("samplemodule",DEPENDANT);
 }