From 1d21dfbda59ae24197c85f88ec5531df88760e56 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Sun, 30 May 2010 11:59:50 +0000 Subject: [PATCH] Fix gnc-module test after patch from bug #618646. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19211 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/gnc-module/test/misc-mods/Makefile.am | 20 ++++++++++---------- src/gnc-module/test/misc-mods/agedver.c | 16 ++++++++-------- src/gnc-module/test/misc-mods/futuremodsys.c | 16 ++++++++-------- src/gnc-module/test/misc-mods/incompatdep.c | 16 ++++++++-------- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/gnc-module/test/misc-mods/Makefile.am b/src/gnc-module/test/misc-mods/Makefile.am index a7b3f5f055..6979d9b889 100644 --- a/src/gnc-module/test/misc-mods/Makefile.am +++ b/src/gnc-module/test/misc-mods/Makefile.am @@ -7,22 +7,22 @@ AM_CPPFLAGS = \ LDADD = -L../.. -L../../.libs PWD := $(shell pwd) -check_LTLIBRARIES=libfuturemodsys.la libincompatdep.la libagedver.la +check_LTLIBRARIES=libgncmod_futuremodsys.la libgncmod_incompatdep.la libgncmod_agedver.la -libfuturemodsys_la_SOURCES=futuremodsys.c -libfuturemodsys_la_LDFLAGS=-rpath ${PWD} -avoid-version -libfuturemodsys_la_LIBADD = \ +libgncmod_futuremodsys_la_SOURCES=futuremodsys.c +libgncmod_futuremodsys_la_LDFLAGS=-rpath ${PWD} -avoid-version +libgncmod_futuremodsys_la_LIBADD = \ $(GLIB_LIBS) -libincompatdep_la_SOURCES=incompatdep.c -libincompatdep_la_LDFLAGS=--rpath ${PWD} -avoid-version -libincompatdep_la_LIBADD = \ +libgncmod_incompatdep_la_SOURCES=incompatdep.c +libgncmod_incompatdep_la_LDFLAGS=--rpath ${PWD} -avoid-version +libgncmod_incompatdep_la_LIBADD = \ ../../libgnc-module.la \ $(GLIB_LIBS) -libagedver_la_SOURCES=agedver.c -libagedver_la_LDFLAGS=-rpath ${PWD} -avoid-version -libagedver_la_LIBADD = \ +libgncmod_agedver_la_SOURCES=agedver.c +libgncmod_agedver_la_LDFLAGS=-rpath ${PWD} -avoid-version +libgncmod_agedver_la_LIBADD = \ $(GLIB_LIBS) CLEANFILES = *.so* *.a diff --git a/src/gnc-module/test/misc-mods/agedver.c b/src/gnc-module/test/misc-mods/agedver.c index bec008b12b..b7e7864559 100644 --- a/src/gnc-module/test/misc-mods/agedver.c +++ b/src/gnc-module/test/misc-mods/agedver.c @@ -6,28 +6,28 @@ #include "gnc-module.h" #include "gnc-module-api.h" -GNC_MODULE_API_DECL(libagedver) +GNC_MODULE_API_DECL(libgncmod_agedver) -int libagedver_gnc_module_system_interface = 0; +int libgncmod_agedver_gnc_module_system_interface = 0; -int libagedver_gnc_module_current = 12; -int libagedver_gnc_module_age = 9; -int libagedver_gnc_module_revision = 0; +int libgncmod_agedver_gnc_module_current = 12; +int libgncmod_agedver_gnc_module_age = 9; +int libgncmod_agedver_gnc_module_revision = 0; char * -libagedver_gnc_module_path(void) +libgncmod_agedver_gnc_module_path(void) { return g_strdup("gnucash/agedver"); } char * -libagedver_gnc_module_description(void) +libgncmod_agedver_gnc_module_description(void) { return g_strdup("this is a frequently extended module"); } int -libagedver_gnc_module_init(int refcount) +libgncmod_agedver_gnc_module_init(int refcount) { return TRUE; } diff --git a/src/gnc-module/test/misc-mods/futuremodsys.c b/src/gnc-module/test/misc-mods/futuremodsys.c index 5488d31a67..dfb4915775 100644 --- a/src/gnc-module/test/misc-mods/futuremodsys.c +++ b/src/gnc-module/test/misc-mods/futuremodsys.c @@ -7,29 +7,29 @@ #include #include "gnc-module-api.h" -GNC_MODULE_API_DECL(libfuturemodsys) +GNC_MODULE_API_DECL(libgncmod_futuremodsys) -int libfuturemodsys_gnc_module_system_interface = 123456; +int libgncmod_futuremodsys_gnc_module_system_interface = 123456; -int libfuturemodsys_gnc_module_current = 0; -int libfuturemodsys_gnc_module_age = 0; -int libfuturemodsys_gnc_module_revision = 0; +int libgncmod_futuremodsys_gnc_module_current = 0; +int libgncmod_futuremodsys_gnc_module_age = 0; +int libgncmod_futuremodsys_gnc_module_revision = 0; char * -libfuturemodsys_gnc_module_path(void) +libgncmod_futuremodsys_gnc_module_path(void) { return g_strdup("gnucash/futuremodsys"); } char * -libfuturemodsys_gnc_module_description(void) +libgncmod_futuremodsys_gnc_module_description(void) { return g_strdup("this is a broken future module"); } int -libfuturemodsys_gnc_module_init(int refcount) +libgncmod_futuremodsys_gnc_module_init(int refcount) { return TRUE; } diff --git a/src/gnc-module/test/misc-mods/incompatdep.c b/src/gnc-module/test/misc-mods/incompatdep.c index 5ac8f7f6f7..e9edca5ec8 100644 --- a/src/gnc-module/test/misc-mods/incompatdep.c +++ b/src/gnc-module/test/misc-mods/incompatdep.c @@ -7,29 +7,29 @@ #include "gnc-module.h" #include "gnc-module-api.h" -GNC_MODULE_API_DECL(libincompatdep) +GNC_MODULE_API_DECL(libgncmod_incompatdep) -int libincompatdep_gnc_module_system_interface = 0; +int libgncmod_incompatdep_gnc_module_system_interface = 0; -int libincompatdep_gnc_module_current = 0; -int libincompatdep_gnc_module_age = 0; -int libincompatdep_gnc_module_revision = 0; +int libgncmod_incompatdep_gnc_module_current = 0; +int libgncmod_incompatdep_gnc_module_age = 0; +int libgncmod_incompatdep_gnc_module_revision = 0; char * -libincompatdep_gnc_module_path(void) +libgncmod_incompatdep_gnc_module_path(void) { return g_strdup("gnucash/incompatdep"); } char * -libincompatdep_gnc_module_description(void) +libgncmod_incompatdep_gnc_module_description(void) { return g_strdup("this is a broken module"); } int -libincompatdep_gnc_module_init(int refcount) +libgncmod_incompatdep_gnc_module_init(int refcount) { if (gnc_module_load("gnucash/foo", 25)) {