From 14a9e95492475df7d7420e1da4c85912f690ea32 Mon Sep 17 00:00:00 2001 From: Christian Thaeter Date: Wed, 10 Sep 2008 16:32:59 +0200 Subject: [PATCH] moved plugin code from lib to backend Plugin management will become stateful. This qualifies it to become a backend subsystem. --- Makefile.am | 1 - src/backend/Makefile.am | 6 ++-- src/{lib => backend}/plugin.c | 0 src/{lib => backend}/plugin.h | 0 src/lib/Makefile.am | 2 -- tests/{plugin => backend}/example_plugin.c | 0 tests/{plugin => backend}/example_plugin.cpp | 0 tests/{plugin => backend}/hello_interface.h | 0 tests/{plugin => backend}/plugin_main.c | 0 tests/plugin/DIR_INFO | 3 -- tests/plugin/Makefile.am | 37 -------------------- 11 files changed, 4 insertions(+), 45 deletions(-) rename src/{lib => backend}/plugin.c (100%) rename src/{lib => backend}/plugin.h (100%) rename tests/{plugin => backend}/example_plugin.c (100%) rename tests/{plugin => backend}/example_plugin.cpp (100%) rename tests/{plugin => backend}/hello_interface.h (100%) rename tests/{plugin => backend}/plugin_main.c (100%) delete mode 100644 tests/plugin/DIR_INFO delete mode 100644 tests/plugin/Makefile.am diff --git a/Makefile.am b/Makefile.am index f3ae3ef41..d236fbfd8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,7 +62,6 @@ include $(top_srcdir)/icons/Makefile.am include $(top_srcdir)/tests/common/Makefile.am include $(top_srcdir)/tests/components/Makefile.am include $(top_srcdir)/tests/Makefile.am -include $(top_srcdir)/tests/plugin/Makefile.am #EXTRA_DIST += admin debian doc depcomp README.BUILD LICENSE \ # cinelerra-cvs-current.spec diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am index abb576021..ce63e44de 100644 --- a/src/backend/Makefile.am +++ b/src/backend/Makefile.am @@ -23,6 +23,7 @@ liblumibackend_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror liblumibackend_a_SOURCES = \ $(liblumibackend_a_srcdir)/mediaaccessfacade.cpp \ $(liblumibackend_a_srcdir)/backend.c \ + $(liblumibackend_a_srcdir)/plugin.c \ $(liblumibackend_a_srcdir)/file.c \ $(liblumibackend_a_srcdir)/filehandle.c \ $(liblumibackend_a_srcdir)/filedescriptor.c \ @@ -30,19 +31,20 @@ liblumibackend_a_SOURCES = \ $(liblumibackend_a_srcdir)/config.c \ $(liblumibackend_a_srcdir)/config_typed.c \ $(liblumibackend_a_srcdir)/configentry.c \ - $(liblumibackend_a_srcdir)/configitem.c \ + $(liblumibackend_a_srcdir)/configitem.c \ $(liblumibackend_a_srcdir)/config_lookup.c noinst_HEADERS += \ $(liblumibackend_a_srcdir)/mediaaccessfacade.cpp \ $(liblumibackend_a_srcdir)/backend.h \ + $(liblumibackend_a_srcdir)/plugin.h \ $(liblumibackend_a_srcdir)/file.h \ $(liblumibackend_a_srcdir)/filehandle.h \ $(liblumibackend_a_srcdir)/filedescriptor.h \ $(liblumibackend_a_srcdir)/filehandlecache.h \ $(liblumibackend_a_srcdir)/config.h \ $(liblumibackend_a_srcdir)/configentry.h \ - $(liblumibackend_a_srcdir)/configitem.h \ + $(liblumibackend_a_srcdir)/configitem.h \ $(liblumibackend_a_srcdir)/config_lookup.h diff --git a/src/lib/plugin.c b/src/backend/plugin.c similarity index 100% rename from src/lib/plugin.c rename to src/backend/plugin.c diff --git a/src/lib/plugin.h b/src/backend/plugin.h similarity index 100% rename from src/lib/plugin.h rename to src/backend/plugin.h diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index e7c22abdb..eab9b1465 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -21,7 +21,6 @@ noinst_LIBRARIES += liblumi.a liblumi_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror liblumi_a_SOURCES = \ - $(liblumi_a_srcdir)/plugin.c \ $(liblumi_a_srcdir)/error.c \ $(liblumi_a_srcdir)/mutex.c \ $(liblumi_a_srcdir)/rwlock.c \ @@ -35,7 +34,6 @@ liblumi_a_SOURCES = \ $(liblumi_a_srcdir)/appconfig.cpp noinst_HEADERS += \ - $(liblumi_a_srcdir)/plugin.h \ $(liblumi_a_srcdir)/error.h \ $(liblumi_a_srcdir)/mutex.h \ $(liblumi_a_srcdir)/rwlock.h \ diff --git a/tests/plugin/example_plugin.c b/tests/backend/example_plugin.c similarity index 100% rename from tests/plugin/example_plugin.c rename to tests/backend/example_plugin.c diff --git a/tests/plugin/example_plugin.cpp b/tests/backend/example_plugin.cpp similarity index 100% rename from tests/plugin/example_plugin.cpp rename to tests/backend/example_plugin.cpp diff --git a/tests/plugin/hello_interface.h b/tests/backend/hello_interface.h similarity index 100% rename from tests/plugin/hello_interface.h rename to tests/backend/hello_interface.h diff --git a/tests/plugin/plugin_main.c b/tests/backend/plugin_main.c similarity index 100% rename from tests/plugin/plugin_main.c rename to tests/backend/plugin_main.c diff --git a/tests/plugin/DIR_INFO b/tests/plugin/DIR_INFO deleted file mode 100644 index c051168cc..000000000 --- a/tests/plugin/DIR_INFO +++ /dev/null @@ -1,3 +0,0 @@ -working example code for Lumiera's plugin system -This directory contains example code which shows how to use specific features. -All examples will be build and run as part of the testsuite diff --git a/tests/plugin/Makefile.am b/tests/plugin/Makefile.am deleted file mode 100644 index c8cf9a22f..000000000 --- a/tests/plugin/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) Lumiera.org -# 2007, Christian Thaeter -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -examples_srcdir = $(top_srcdir)/tests/plugin -noinst_PROGRAMS += test-plugin - -test_plugin_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Werror -test_plugin_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -test_plugin_LDADD = liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -test_plugin_SOURCES = $(examples_srcdir)/plugin_main.c - -noinst_HEADERS += $(examples_srcdir)/hello_interface.h - -check_LTLIBRARIES += example_plugin.la example_plugin_cpp.la -example_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -example_plugin_la_SOURCES = $(examples_srcdir)/example_plugin.c -# the -rpath option is required, prolly a automake bug? -example_plugin_la_LDFLAGS = -avoid-version -module -rpath $(shell pwd) - -example_plugin_cpp_la_CPPFLAGS = $(AM_CPPFLAGS) -Wall -Werror -example_plugin_cpp_la_SOURCES = $(examples_srcdir)/example_plugin.cpp -# the -rpath option is required, prolly a automake bug? -example_plugin_cpp_la_LDFLAGS = -avoid-version -module -rpath $(shell pwd)