From a521ac8f8134a60feadf4314d20325b1a6e970fa Mon Sep 17 00:00:00 2001 From: compudj Date: Fri, 30 May 2003 13:28:06 +0000 Subject: [PATCH] sample libs install ok git-svn-id: http://ltt.polymtl.ca/svn@41 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt/branches/poly/configure.in | 5 +++-- ltt/branches/poly/lttv/plugins/Makefile.am | 10 ++++++---- ltt/branches/poly/lttv/test/Makefile.am | 15 --------------- ltt/branches/poly/lttv/test/sampledep.c | 21 --------------------- ltt/branches/poly/lttv/test/samplemodule.c | 15 --------------- ltt/branches/poly/lttv/test/samplemodule2.c | 15 --------------- 6 files changed, 9 insertions(+), 72 deletions(-) delete mode 100644 ltt/branches/poly/lttv/test/Makefile.am delete mode 100644 ltt/branches/poly/lttv/test/sampledep.c delete mode 100644 ltt/branches/poly/lttv/test/samplemodule.c delete mode 100644 ltt/branches/poly/lttv/test/samplemodule2.c diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in index 9a867238..74d0d42d 100644 --- a/ltt/branches/poly/configure.in +++ b/ltt/branches/poly/configure.in @@ -37,8 +37,8 @@ AC_CHECK_FUNCS([select]) #CPPFLAGS="$CPPFLAGS -I" -lttplugindir="${libdir}/ltt/plugins" -AC_SUBST(lttplugindir) +lttvplugindir="${libdir}/lttv/plugins" +AC_SUBST(lttvplugindir) DEFAULT_INCLUDES="-I\$(top_srcdir)/include" AC_SUBST(DEFAULT_INCLUDES) @@ -52,6 +52,7 @@ AC_SUBST(lttincludedir) AC_CONFIG_FILES([Makefile lttv/Makefile lttv/plugins/Makefile + lttv/plugins/exemples/Makefile lttd/Makefile LibLTT/Makefile]) AC_OUTPUT diff --git a/ltt/branches/poly/lttv/plugins/Makefile.am b/ltt/branches/poly/lttv/plugins/Makefile.am index 38117841..0ab08e39 100644 --- a/ltt/branches/poly/lttv/plugins/Makefile.am +++ b/ltt/branches/poly/lttv/plugins/Makefile.am @@ -4,8 +4,10 @@ # Created by Mathieu Desnoyers on May 6, 2003 # -libdir = ${lttplugindir} +SUBDIRS = exemples -#lib_LTLIBRARIES = samplemodule2.la -#samplemodule2_la_LDFLAGS = -module -#samplemodule2_la_SOURCES = samplemodule2.c +libdir = ${lttvplugindir} + +#lib_LTLIBRARIES = sampledep.la +#sampledep_la_LDFLAGS = -module +#sampledep_la_SOURCES = sampledep.c diff --git a/ltt/branches/poly/lttv/test/Makefile.am b/ltt/branches/poly/lttv/test/Makefile.am deleted file mode 100644 index 5c448d7b..00000000 --- a/ltt/branches/poly/lttv/test/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -# -# Makefile for LTT New generation user interface : test plugins. -# -# Created by Mathieu Desnoyers on May 6, 2003 -# - -libdir = ${lttplugindir} - -lib_LTLIBRARIES = sampledep.la samplemodule.la samplemodule2.la -sampledep_la_LDFLAGS = -module -sampledep_la_SOURCES = sampledep.c -samplemodule_la_LDFLAGS = -module -samplemodule_la_SOURCES = samplemodule.c -samplemodule2_la_LDFLAGS = -module -samplemodule2_la_SOURCES = samplemodule2.c diff --git a/ltt/branches/poly/lttv/test/sampledep.c b/ltt/branches/poly/lttv/test/sampledep.c deleted file mode 100644 index 805c5283..00000000 --- a/ltt/branches/poly/lttv/test/sampledep.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Sample module for Linux Trace Toolkit new generation User Interface */ - -/* Created by Mathieu Desnoyers, may 2003 */ - -#include -#include - -/* Include module.h from lttv headers for module loading */ -#include - -G_MODULE_EXPORT void init() { - g_critical("Sample module dependant init()"); - - lttv_module_load("samplemodule",0,NULL,DEPENDANT); -} - -G_MODULE_EXPORT void destroy() { - g_critical("Sample module dependant destroy()"); - lttv_module_unload_name("samplemodule",DEPENDANT); -} - diff --git a/ltt/branches/poly/lttv/test/samplemodule.c b/ltt/branches/poly/lttv/test/samplemodule.c deleted file mode 100644 index e64ab2f4..00000000 --- a/ltt/branches/poly/lttv/test/samplemodule.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Sample module for Linux Trace Toolkit new generation User Interface */ - -/* Created by Mathieu Desnoyers, may 2003 */ - -#include -#include - -G_MODULE_EXPORT void init() { - g_critical("Sample module init()"); -} - -G_MODULE_EXPORT void destroy() { - g_critical("Sample module destroy()"); -} - diff --git a/ltt/branches/poly/lttv/test/samplemodule2.c b/ltt/branches/poly/lttv/test/samplemodule2.c deleted file mode 100644 index 3d7bb1c0..00000000 --- a/ltt/branches/poly/lttv/test/samplemodule2.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Sample module for Linux Trace Toolkit new generation User Interface */ - -/* Created by Mathieu Desnoyers, may 2003 */ - -#include -#include - -G_MODULE_EXPORT void init() { - g_critical("Sample module 2 init()"); -} - -G_MODULE_EXPORT void destroy() { - g_critical("Sample module 2 destroy()"); -} - -- 2.34.1