Commit ea50e26c authored by Morten Welinder's avatar Morten Welinder

Convert fn-lookup into a plugin.

parent dcd06282
...@@ -66,6 +66,7 @@ Morten: ...@@ -66,6 +66,7 @@ Morten:
* Make fn-financial a plugin. * Make fn-financial a plugin.
* Make fn-info[rmation] a plugin. * Make fn-info[rmation] a plugin.
* Make fn-logical a plugin. * Make fn-logical a plugin.
* Make fn-lookup a plugin.
* Make fn-math a plugin. * Make fn-math a plugin.
* Make fn-string a plugin. * Make fn-string a plugin.
* Partially untangle remaining fn-files. * Partially untangle remaining fn-files.
......
...@@ -648,6 +648,7 @@ plugins/fn-eng/Makefile ...@@ -648,6 +648,7 @@ plugins/fn-eng/Makefile
plugins/fn-financial/Makefile plugins/fn-financial/Makefile
plugins/fn-info/Makefile plugins/fn-info/Makefile
plugins/fn-logical/Makefile plugins/fn-logical/Makefile
plugins/fn-lookup/Makefile
plugins/fn-math/Makefile plugins/fn-math/Makefile
plugins/fn-string/Makefile plugins/fn-string/Makefile
plugins/derivatives/Makefile plugins/derivatives/Makefile
......
...@@ -51,7 +51,7 @@ endif ...@@ -51,7 +51,7 @@ endif
SUBDIRS_FILE_FORMATS = $(EXCEL_DIR) lotus-123 oleo sc sylk xbase html dif \ SUBDIRS_FILE_FORMATS = $(EXCEL_DIR) lotus-123 oleo sc sylk xbase html dif \
xml_sax applix mps $(GNOME_GLOSSARY_DIR) $(PSICONV_DIR) xml_sax applix mps $(GNOME_GLOSSARY_DIR) $(PSICONV_DIR)
SUBDIRS_FUNCTIONS = numtheory fn-date fn-eng fn-financial fn-info fn-logical fn-math fn-string derivatives \ SUBDIRS_FUNCTIONS = numtheory fn-date fn-eng fn-financial fn-info fn-logical fn-lookup fn-math fn-string derivatives \
$(PYTHON_DIR) $(PERL_DIR) $(GUILE_DIR) $(GB_DIR) \ $(PYTHON_DIR) $(PERL_DIR) $(GUILE_DIR) $(GB_DIR) \
$(GDA_DIR) $(PYFUNC_DIR) $(GDA_DIR) $(PYFUNC_DIR)
......
Makefile.in
Makefile
.deps
.libs
*.lo
*.la
plugin.xml
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-I$(top_srcdir)/src -I$(top_builddir)/src \
$(GNUMERIC_CFLAGS)
gnumeric_plugin_fnlookupdir = $(gnumeric_plugindir)/fn-lookup
xmldir = $(gnumeric_plugin_fnlookupdir)
gnumeric_plugin_fnlookup_LTLIBRARIES = plugin.la
plugin_la_LDFLAGS = -module -avoid-version
plugin_la_SOURCES = functions.c
xml_in_files = plugin.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
@INTLTOOL_XML_RULE@
EXTRA_DIST = $(xml_in_files)
DISTCLEANFILES = $(xml_DATA)
<?xml version="1.0"?>
<plugin id="Gnumeric_fnlookup">
<information>
<_name>Lookup Functions</_name>
<_description>Functions for looking up values in ranges</_description>
</information>
<loader type="g_module">
<attribute name="module_file" value="plugin.la"/>
</loader>
<services>
<service type="function_group" id="lookup">
<_category>Lookup</_category>
<functions>
<function name="address"/>
<function name="choose"/>
<function name="column"/>
<function name="columns"/>
<function name="hlookup"/>
<function name="hyperlink"/>
<function name="indirect"/>
<function name="index"/>
<function name="lookup"/>
<function name="match"/>
<function name="offset"/>
<function name="row"/>
<function name="rows"/>
<function name="transpose"/>
<function name="vlookup"/>
</functions>
</service>
</services>
</plugin>
...@@ -23,6 +23,8 @@ plugins/fn-info/functions.c ...@@ -23,6 +23,8 @@ plugins/fn-info/functions.c
plugins/fn-info/plugin.xml.in plugins/fn-info/plugin.xml.in
plugins/fn-logical/functions.c plugins/fn-logical/functions.c
plugins/fn-logical/plugin.xml.in plugins/fn-logical/plugin.xml.in
plugins/fn-lookup/functions.c
plugins/fn-lookup/plugin.xml.in
plugins/fn-math/functions.c plugins/fn-math/functions.c
plugins/fn-math/plugin.xml.in plugins/fn-math/plugin.xml.in
plugins/fn-string/functions.c plugins/fn-string/functions.c
...@@ -183,8 +185,6 @@ src/formats.c ...@@ -183,8 +185,6 @@ src/formats.c
src/func.c src/func.c
src/func-builtin.c src/func-builtin.c
src/functions/fn-database.c src/functions/fn-database.c
src/functions/fn-lookup.c
src/functions/fn-sheet.c
src/functions/fn-stat.c src/functions/fn-stat.c
src/gnumeric-canvas.c src/gnumeric-canvas.c
src/gnumeric-graph.c src/gnumeric-graph.c
......
...@@ -37,7 +37,6 @@ static GList *categories = NULL; ...@@ -37,7 +37,6 @@ static GList *categories = NULL;
static SymbolTable *global_symbol_table = NULL; static SymbolTable *global_symbol_table = NULL;
extern void stat_functions_init (void); extern void stat_functions_init (void);
extern void lookup_functions_init (void);
extern void database_functions_init (void); extern void database_functions_init (void);
void void
...@@ -46,7 +45,6 @@ functions_init (void) ...@@ -46,7 +45,6 @@ functions_init (void)
global_symbol_table = symbol_table_new (); global_symbol_table = symbol_table_new ();
stat_functions_init (); stat_functions_init ();
lookup_functions_init ();
database_functions_init (); database_functions_init ();
func_builtin_init (); func_builtin_init ();
} }
......
...@@ -9,5 +9,4 @@ noinst_LIBRARIES = libfunctions.a ...@@ -9,5 +9,4 @@ noinst_LIBRARIES = libfunctions.a
libfunctions_a_SOURCES = \ libfunctions_a_SOURCES = \
fn-database.c \ fn-database.c \
fn-lookup.c \
fn-stat.c fn-stat.c
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment