Commit 7a725771 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

new to write csv files without intervention. (stf_init) : Use it.



2003-10-10  Jody Goldberg <jody@gnome.org>

	* src/stf.c (stf_write_csv) : new to write csv files without
	  intervention.
	(stf_init) : Use it.

2003-10-09  Jody Goldberg <jody@gnome.org>

	* src/libgnumeric.c : pull the ancient if BONOBO checks

	* src/io-context-gtk.c (icg_show_gui) : mark the window as a splash.

	* schemas/Makefile.am : make friendlier for rpm builders
parent eb88c30b
......@@ -56,7 +56,7 @@ find_cells_that_match (Sheet *sheet, GnmValue *database,
GSList *ptr, *condition, *cells;
int row, first_row, last_row;
gboolean add_flag;
Cell *cell;
GnmCell *cell;
cells = NULL;
/* TODO : Why ignore the first row ? What if there is no header ? */
......@@ -81,7 +81,7 @@ find_cells_that_match (Sheet *sheet, GnmValue *database,
for (;condition != NULL ; condition = condition->next) {
func_criteria_t const *cond = condition->data;
Cell const *tmp = sheet_cell_get (sheet,
GnmCell const *tmp = sheet_cell_get (sheet,
cond->column, row);
if (cell != NULL)
......@@ -127,7 +127,7 @@ database_find_values (Sheet *sheet, GnmValue *database,
else
res = res2 = g_new (GnmValue *, cellcount + 1);
for (count = 0, current = cells; current; current = current->next) {
Cell *cell = current->data;
GnmCell *cell = current->data;
GnmValue *value = cell->value;
if ((flags & COLLECT_IGNORE_STRINGS) && value->type == VALUE_STRING)
......@@ -1167,7 +1167,7 @@ static GnmValue *
gnumeric_getpivotdata (FunctionEvalInfo *ei, GnmValue **argv)
{
int col, row;
Cell *cell;
GnmCell *cell;
col = find_column_of_field (ei->pos, argv[0], argv[1]);
if (col == -1)
......
......@@ -222,7 +222,7 @@ gnumeric_cell (FunctionEvalInfo *ei, GnmValue **argv)
/* absolutely pointless - compatibility only */
} else if (!g_ascii_strcasecmp (info_type, "contents") ||
!g_ascii_strcasecmp (info_type, "value")) {
Cell const *cell =
GnmCell const *cell =
sheet_cell_get (ei->pos->sheet, ref->col, ref->row);
if (cell && cell->value)
return value_duplicate (cell->value);
......@@ -265,7 +265,7 @@ gnumeric_cell (FunctionEvalInfo *ei, GnmValue **argv)
!g_ascii_strcasecmp (info_type, "prefixcharacter")) {
MStyle const *mstyle =
sheet_style_get (ei->pos->sheet, ref->col, ref->row);
Cell const *cell =
GnmCell const *cell =
sheet_cell_get (ei->pos->sheet, ref->col, ref->row);
if (cell && cell->value && cell->value->type == VALUE_STRING) {
......@@ -314,7 +314,7 @@ gnumeric_cell (FunctionEvalInfo *ei, GnmValue **argv)
} else if (!g_ascii_strcasecmp (info_type, "type") ||
!g_ascii_strcasecmp (info_type, "datatype") ||
!g_ascii_strcasecmp (info_type, "formulatype")) {
Cell const *cell =
GnmCell const *cell =
sheet_cell_get (ei->pos->sheet, ref->col, ref->row);
if (cell && cell->value) {
if (cell->value->type == VALUE_STRING)
......@@ -1171,7 +1171,7 @@ gnumeric_expression (FunctionEvalInfo *ei, GnmValue **args)
{
GnmValue const * const v = args[0];
if (v->type == VALUE_CELLRANGE) {
Cell *cell;
GnmCell *cell;
GnmCellRef const * a = &v->v_range.cell.a;
GnmCellRef const * b = &v->v_range.cell.b;
......@@ -1212,7 +1212,7 @@ static char const *help_countblank = {
static GnmValue *
cb_countblank (Sheet *sheet, int col, int row,
Cell *cell, void *user_data)
GnmCell *cell, void *user_data)
{
cell_eval (cell);
if (!cell_is_empty (cell))
......@@ -1522,7 +1522,7 @@ gnumeric_isblank (FunctionEvalInfo *ei, GnmExprList *expr_node_list)
GnmCellRef const *ref = &expr->cellref.ref;
Sheet const *sheet = eval_sheet (ref->sheet, ei->pos->sheet);
GnmCellPos pos;
Cell *cell;
GnmCell *cell;
cellref_get_abs_pos (ref, &ei->pos->eval, &pos);
cell = sheet_cell_get (sheet, pos.col, pos.row);
......
......@@ -52,7 +52,7 @@ typedef struct {
static GnmValue *
callback_function_sumxy (Sheet *sheet, int col, int row,
Cell *cell, void *user_data)
GnmCell *cell, void *user_data)
{
math_sums_t *mm = user_data;
gnm_float x;
......@@ -100,7 +100,7 @@ typedef struct {
static GnmValue *
callback_function_criteria (Sheet *sheet, int col, int row,
Cell *cell, void *user_data)
GnmCell *cell, void *user_data)
{
math_criteria_t *mm = user_data;
GnmValue *v;
......@@ -604,7 +604,7 @@ static char const *help_sumif = {
static GnmValue *
callback_function_sumif (Sheet *sheet, int col, int row,
Cell *cell, void *user_data)
GnmCell *cell, void *user_data)
{
math_criteria_t *mm = user_data;
gnm_float v = 0.;
......@@ -2705,7 +2705,7 @@ static char const *help_minverse = {
static GnmValue *
callback_function_mmult_validate (Sheet *sheet, int col, int row,
Cell *cell, void *user_data)
GnmCell *cell, void *user_data)
{
int *item_count = user_data;
......
......@@ -133,7 +133,7 @@ typedef struct {
} randdiscrete_t;
static GnmValue *
cb_randdiscrete (Sheet *sheet, int col, int row, Cell *cell, void *user_data)
cb_randdiscrete (Sheet *sheet, int col, int row, GnmCell *cell, void *user_data)
{
randdiscrete_t *p = (randdiscrete_t *) user_data;
......
......@@ -289,7 +289,7 @@ typedef struct {
static GnmValue *
callback_function_rank (Sheet *sheet, int col, int row,
Cell *cell, void *user_data)
GnmCell *cell, void *user_data)
{
stat_rank_t *p = user_data;
gnm_float x;
......@@ -2742,7 +2742,7 @@ typedef struct {
static GnmValue *
callback_function_list (Sheet *sheet, int col, int row,
Cell *cell, void *user_data)
GnmCell *cell, void *user_data)
{
stat_list_t *mm = user_data;
gnm_float *p;
......
......@@ -44,7 +44,7 @@ excel_gb_range_set_arg (GBRunEvalContext *ec,
case VALUE: {
GnmValue *value;
Cell *cell;
GnmCell *cell;
value = gb_to_value (val);
if (!value) {
......@@ -62,7 +62,7 @@ excel_gb_range_set_arg (GBRunEvalContext *ec,
}
case TEXT: {
Cell *cell;
GnmCell *cell;
cell = sheet_cell_fetch (range->sheet,
range->range.start.col,
......@@ -90,7 +90,7 @@ excel_gb_range_get_arg (GBRunEvalContext *ec,
switch (property) {
case VALUE: {
Cell *cell;
GnmCell *cell;
GBValue *val;
cell = sheet_cell_get (range->sheet,
......@@ -109,7 +109,7 @@ excel_gb_range_get_arg (GBRunEvalContext *ec,
}
case TEXT: {
Cell *cell;
GnmCell *cell;
char *txt;
GBValue *val;
......
......@@ -116,9 +116,9 @@ html_print_encoded (GsfOutput *output, char const *str)
*
*/
static void
html_get_text_color (Cell *cell, MStyle *mstyle, guint *r, guint *g, guint *b)
html_get_text_color (GnmCell *cell, MStyle *mstyle, guint *r, guint *g, guint *b)
{
const PangoColor *fore = cell_get_render_color (cell);
PangoColor const *fore = cell_get_render_color (cell);
if (fore == NULL)
*r = *g = *b = 0;
......@@ -141,7 +141,7 @@ html_get_color (MStyle *mstyle, MStyleElementType t, guint *r, guint *g, guint *
}
static void
html_write_cell_content (GsfOutput *output, Cell *cell, MStyle *mstyle, html_version_t version)
html_write_cell_content (GsfOutput *output, GnmCell *cell, MStyle *mstyle, html_version_t version)
{
guint r = 0;
guint g = 0;
......@@ -282,7 +282,7 @@ html_write_border_style_40 (GsfOutput *output, MStyle *mstyle)
static void
write_cell (GsfOutput *output, Sheet *sheet, gint row, gint col, html_version_t version)
{
Cell *cell;
GnmCell *cell;
MStyle *mstyle;
guint r, g, b;
......
......@@ -188,12 +188,11 @@ html_read_row (htmlNodePtr cur, htmlDocPtr doc, GnmHtmlTableCtxt *tc)
html_read_content (ptr, buf, mstyle, a_buf, TRUE, doc);
if (buf->len > 0) {
Cell *cell = sheet_cell_fetch (tc->sheet, col + 1, tc->row);
GnmCell *cell = sheet_cell_fetch (tc->sheet, col + 1, tc->row);
sheet_style_set_pos (tc->sheet, col + 1, tc->row, mstyle);
cell_set_text (cell, buf->str);
} else {
} else
mstyle_unref (mstyle);
}
if (a_buf->use > 0) {
char *name;
......
......@@ -679,7 +679,7 @@ latex2e_write_blank_cell (GsfOutput *output, gint col, gint row, gint index,
* makes it much more difficult to change column widths later on.
*/
static void
latex2e_write_multicolumn_cell (GsfOutput *output, Cell *cell, int num_merged_cols,
latex2e_write_multicolumn_cell (GsfOutput *output, GnmCell *cell, int num_merged_cols,
int num_merged_rows, gint index,
StyleBorderType *borders, Sheet *sheet)
{
......@@ -1021,7 +1021,7 @@ void
latex_file_save (GnmFileSaver const *fs, IOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
Cell *cell;
GnmCell *cell;
Sheet *current_sheet;
GnmRange total_range;
GnmRange const *merge_range;
......@@ -1153,7 +1153,7 @@ latex_file_save (GnmFileSaver const *fs, IOContext *io_context,
/* covered by a span! */
the_span = row_span_get (ri, col);
if (the_span != NULL) {
latex2e_write_multicolumn_cell(output, (Cell *)the_span->cell,
latex2e_write_multicolumn_cell(output, (GnmCell *)the_span->cell,
the_span->right -
col + 1, 1,
col - total_range.start.col,
......
......@@ -41,7 +41,7 @@
* escape special characters .. needs work
*/
static int
roff_fprintf (GsfOutput *output, Cell *cell)
roff_fprintf (GsfOutput *output, GnmCell *cell)
{
int len, i;
const char *p;
......@@ -89,7 +89,7 @@ roff_file_save (GnmFileSaver const *fs, IOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output)
{
GList *sheets, *ptr;
Cell *cell;
GnmCell *cell;
int row, col, fontsize, v_size;
Workbook *wb = wb_view_workbook (wb_view);
......
......@@ -62,7 +62,7 @@ append_zeros (char *s, int n) {
}
static void
cell_set_format_from_lotus_format (Cell *cell, int fmt)
cell_set_format_from_lotus_format (GnmCell *cell, int fmt)
{
int fmt_type = (fmt >> 4) & 0x7;
int precision = fmt&0xf;
......@@ -177,10 +177,10 @@ record_destroy (record_t *r)
}
}
static Cell *
static GnmCell *
insert_value (Sheet *sheet, guint32 col, guint32 row, GnmValue *val)
{
Cell *cell;
GnmCell *cell;
g_return_val_if_fail (val != NULL, NULL);
g_return_val_if_fail (sheet != NULL, NULL);
......@@ -221,7 +221,7 @@ lotus_wk1_read (LotusWk1Read *state)
{
gboolean result = TRUE;
int sheetidx = 0;
Cell *cell;
GnmCell *cell;
GnmValue *v;
guint16 fmt; /* Format code of Lotus Cell */
record_t *r;
......
......@@ -69,7 +69,7 @@ GNUMERIC_MODULE_PLUGIN_INFO_DECL;
static inline void
mps_set_cell (Sheet *sh, int col, int row, const gchar *str)
{
Cell *cell = sheet_cell_fetch (sh, col, row);
GnmCell *cell = sheet_cell_fetch (sh, col, row);
sheet_cell_set_value (cell, value_new_string (str));
}
......@@ -78,7 +78,7 @@ mps_set_cell (Sheet *sh, int col, int row, const gchar *str)
static inline void
mps_set_cell_float (Sheet *sh, int col, int row, const gnm_float f)
{
Cell *cell = sheet_cell_fetch (sh, col, row);
GnmCell *cell = sheet_cell_fetch (sh, col, row);
sheet_cell_set_value (cell, value_new_float (f));
}
......@@ -287,7 +287,7 @@ mps_write_coefficients (MpsInputContext *ctxt, Sheet *sh,
int n_rows_per_fn;
GString *var_range [2];
GnmRange range, v_range;
Cell *cell;
GnmCell *cell;
GString *buf;
/*
......
......@@ -181,7 +181,7 @@ oleo_parse_formula (OleoParseState *state, char const *text, int col, int row)
GnmExpr const *expr;
char *gnumeric_text;
Cell const *cell = sheet_cell_fetch (state->sheet,
GnmCell const *cell = sheet_cell_fetch (state->sheet,
OLEO_TO_GNUMERIC (col), OLEO_TO_GNUMERIC (row));
parse_pos_init_cell (&pos, cell);
......@@ -205,7 +205,7 @@ oleo_parse_formula (OleoParseState *state, char const *text, int col, int row)
static void
oleo_deal_with_cell (OleoParseState *state, guint8 *str, int *ccol, int *crow, MStyle *style)
{
Cell *cell;
GnmCell *cell;
GnmExpr const *expr = NULL;
char *ptr = str + 1, *cval = NULL, *formula = NULL;
......
......@@ -487,7 +487,7 @@ oo_cell_start (GsfXMLIn *xin, xmlChar const **attrs)
}
state->simple_content = FALSE;
if (expr != NULL) {
Cell *cell = sheet_cell_fetch (state->pos.sheet,
GnmCell *cell = sheet_cell_fetch (state->pos.sheet,
state->pos.eval.col, state->pos.eval.row);
if (array_cols > 0 || array_rows > 0) {
......@@ -513,7 +513,7 @@ oo_cell_start (GsfXMLIn *xin, xmlChar const **attrs)
gnm_expr_unref (expr);
}
} else if (val != NULL) {
Cell *cell = sheet_cell_fetch (state->pos.sheet,
GnmCell *cell = sheet_cell_fetch (state->pos.sheet,
state->pos.eval.col, state->pos.eval.row);
/* has cell previously been initialized as part of an array */
......@@ -543,11 +543,12 @@ oo_cell_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
OOParseState *state = (OOParseState *)xin;
if (state->col_inc > 1) {
Cell *cell = sheet_cell_get (state->pos.sheet, state->pos.eval.col, state->pos.eval.row);
GnmCell *cell = sheet_cell_get (state->pos.sheet,
state->pos.eval.col, state->pos.eval.row);
if (!cell_is_empty (cell)) {
int i = 1;
Cell *next;
GnmCell *next;
for (; i < state->col_inc ; i++) {
next = sheet_cell_fetch (state->pos.sheet,
state->pos.eval.col + i, state->pos.eval.row);
......@@ -597,8 +598,9 @@ oo_cell_content_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
OOParseState *state = (OOParseState *)xin;
if (state->simple_content || state->error_content) {
Cell *cell = sheet_cell_fetch (state->pos.sheet, state->pos.eval.col, state->pos.eval.row);
GnmValue *v;
GnmCell *cell = sheet_cell_fetch (state->pos.sheet,
state->pos.eval.col, state->pos.eval.row);
if (state->simple_content)
v = value_new_string (state->base.content->str);
......@@ -924,7 +926,7 @@ openoffice_file_open (GnmFileOpener const *fo, IOContext *io_context,
zip = gsf_infile_zip_new (input, &err);
if (zip == NULL) {
g_return_if_fail (err != NULL);
gnumeric_error_read (COMMAND_CONTEXT (io_context),
gnumeric_error_read (GNM_CMD_CONTEXT (io_context),
err->message);
g_error_free (err);
return;
......@@ -933,7 +935,7 @@ openoffice_file_open (GnmFileOpener const *fo, IOContext *io_context,
content = gsf_infile_child_by_name (GSF_INFILE (zip),
"content.xml");
if (content == NULL) {
gnumeric_error_read (COMMAND_CONTEXT (io_context),
gnumeric_error_read (GNM_CMD_CONTEXT (io_context),
_("No stream named content.xml found."));
g_object_unref (G_OBJECT (zip));
return;
......
......@@ -489,7 +489,7 @@ pln_parse_sheet (GsfInput *input, PlanPerfectImport *state)
int max_row = SHEET_MAX_ROWS;
int i, rcode, rlength;
guint8 const *data;
Cell *cell;
GnmCell *cell;
GnmValue *v;
GnmExpr const *expr;
MStyle *style;
......
......@@ -13,6 +13,6 @@
#include "sheet.h"
#include "plugin.h"
PluginInitResult init_plugin (CommandContext *context, PluginData *pd);
PluginInitResult init_plugin (GnmCmdContext *context, PluginData *pd);
#endif /* GNUMERIC_PLN_H */
......@@ -445,7 +445,7 @@ static void
add_cell (PsiState *state, Sheet *sheet, const psiconv_sheet_cell psi_cell,
const psiconv_formula_list psi_formulas, const MStyle * default_style)
{
Cell *cell;
GnmCell *cell;
GnmValue *val;
GnmExpr *expr;
psiconv_formula psi_formula;
......
......@@ -151,7 +151,7 @@ show_python_console (WorkbookControlGUI *wbcg)
sel = gnm_py_interpreter_selector_new (&err);
if (err != NULL) {
gnumeric_error_error_info (COMMAND_CONTEXT (wbcg), err);
gnumeric_error_error_info (GNM_CMD_CONTEXT (wbcg), err);
error_info_free (err);
return;
}
......
......@@ -1121,7 +1121,7 @@ static PyTypeObject py_MStyle_object_type = {
struct _py_Cell_object {
PyObject_HEAD
Cell *cell;
GnmCell *cell;
};
static PyObject *
......@@ -1153,7 +1153,7 @@ static struct PyMethodDef py_Cell_object_methods[] = {
{NULL, NULL}
};
static Cell *
static GnmCell *
py_Cell_as_Cell (py_Cell_object *self)
{
return self->cell;
......@@ -1265,7 +1265,7 @@ py_Cell_object_dealloc (py_Cell_object *self)
}
static PyObject *
py_new_Cell_object (Cell *cell)
py_new_Cell_object (GnmCell *cell)
{
py_Cell_object *self;
......@@ -1359,7 +1359,7 @@ static PyObject *
py_sheet_cell_fetch_method (py_Sheet_object *self, PyObject *args)
{
gint col, row;
Cell *cell;
GnmCell *cell;
if (!PyArg_ParseTuple (args, (char *) "ii:cell_fetch", &col, &row)) {
return NULL;
......@@ -1497,7 +1497,7 @@ static PyObject *
py_sheet_subscript (py_Sheet_object *self, PyObject *key)
{
gint col, row;
Cell *cell;
GnmCell *cell;
if (!PyArg_ParseTuple (key, (char *) "ii", &col, &row)) {
return NULL;
......
......@@ -60,7 +60,7 @@ typedef struct {
typedef struct {
GnmExprFunction const *node; /* Expression node that calls us */
Dependent *dep; /* Dependent containing that node */
GnmDependent *dep; /* GnmDependent containing that node */
WatchedValue *value;
} Watcher;
......
......@@ -133,7 +133,7 @@ sc_parse_coord (char const **strdata, int *col, int *row)
static gboolean
sc_parse_label (Sheet *sheet, char const *cmd, char const *str, int col, int row)
{
Cell *cell;
GnmCell *cell;
char *s = NULL, *tmpout;
char const *tmpstr;
gboolean result = FALSE;
......@@ -207,7 +207,7 @@ sc_parse_cell_name_list (Sheet *sheet, char const *cell_name_str,
{
char *buf;
GSList *cells = NULL;
Cell *cell;
GnmCell *cell;
GnmCellPos pos;
int i, n;
......@@ -260,7 +260,7 @@ static gboolean
sc_parse_let (Sheet *sheet, char const *cmd, char const *str, int col, int row)
{
GnmExpr const *tree;
Cell *cell;
GnmCell *cell;
ParsePos pos;
GnmValue const *v;
......
......@@ -188,7 +188,7 @@ sylk_rtd_c_parse (SylkReadState *state, const char *str)
}
if (state->val_type != VALUE_EMPTY) {
Cell *cell = sheet_cell_fetch (state->sheet, state->cur_x - 1,
GnmCell *cell = sheet_cell_fetch (state->sheet, state->cur_x - 1,
state->cur_y - 1);
g_assert (cell);
......
......@@ -158,7 +158,7 @@ xbase_file_open (GnmFileOpener const *fo, IOContext *io_context,
XBrecord *record;
char *name;
Sheet *sheet = NULL;
Cell *cell;
GnmCell *cell;
GnmValue *val;
XBfield *field;
ErrorInfo *open_error;
......
......@@ -1083,7 +1083,7 @@ xml_sax_cell (GsfXMLIn *gsf_state, xmlChar const **attrs)
* @cols : The number of columns.
*/
static void
xml_cell_set_array_expr (Cell *cell, char const *text,
xml_cell_set_array_expr (GnmCell *cell, char const *text,
int const cols, int const rows)
{
ParsePos pp;
......@@ -1105,7 +1105,7 @@ xml_cell_set_array_expr (Cell *cell, char const *text,
* If it is not a member of an array return TRUE.
*/
static gboolean
xml_not_used_old_array_spec (Cell *cell, char const *content)
xml_not_used_old_array_spec (GnmCell *cell, char const *content)
{
int rows, cols, row, col;
......@@ -1150,7 +1150,7 @@ xml_sax_cell_content (GsfXMLIn *gsf_state, G_GNUC_UNUSED GsfXMLBlob *blob)
XMLSaxParseState *state = (XMLSaxParseState *)gsf_state;
gboolean is_new_cell, is_post_52_array = FALSE;
Cell *cell;
GnmCell *cell;
int const col = state->cell.col;
int const row = state->cell.row;
......@@ -1244,7 +1244,7 @@ xml_sax_merge (GsfXMLIn *gsf_state, G_GNUC_UNUSED GsfXMLBlob *blob)
if (parse_range (state->base.content->str, &r))
sheet_merge_add (state->sheet, &r, FALSE,
COMMAND_CONTEXT (state->context));
GNM_CMD_CONTEXT (state->context));
}
static void
......
......@@ -633,10 +633,10 @@ xml_write_selection_info (GnmOutputXML *state)
}
static int
natural_order_cmp (const void *a, const void *b)
natural_order_cmp (void const *a, void const *b)
{
Cell const *ca = *(Cell const **)a ;
Cell const *cb = *(Cell const **)b ;
GnmCell const *ca = *(GnmCell const **)a ;
GnmCell const *cb = *(GnmCell const **)b ;
int diff = (ca->pos.row - cb->pos.row);
if (diff != 0)
return diff;
......@@ -644,14 +644,14 @@ natural_order_cmp (const void *a, const void *b)
}
static void
copy_hash_table_to_ptr_array (gpointer key, Cell *cell, gpointer user_data)
copy_hash_table_to_ptr_array (gpointer key, GnmCell *cell, gpointer user_data)
{
if (!cell_is_empty (cell) || cell->base.expression != NULL)
g_ptr_array_add (user_data, cell) ;
}
static void
xml_write_cell (GnmOutputXML *state, Cell const *cell, ParsePos const *pp)
xml_write_cell (GnmOutputXML *state, GnmCell const *cell, ParsePos const *pp)
{
GnmExprArray const *ar;
gboolean write_contents = TRUE;
......@@ -724,7 +724,7 @@ xml_write_cells (GnmOutputXML *state)
size_t i;
GPtrArray *natural = g_ptr_array_new ();
ParsePos pp;
Cell const *cell;
GnmCell const *cell;
gsf_xml_out_start_element (state->output, GMR "Cells");
......
......@@ -4,9 +4,16 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
# don't do this if we are building in eg. rpm
install-data-local:
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
done
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
done \
fi
else
install-data-local:
endif
EXTRA_DIST = $(schema_DATA) $(schema_in_files)