don't clean generated headers

diff --git a/lib/inkpot/Makefile.am b/lib/inkpot/Makefile.am
index c540c44165323c55f8075613c491c561135f7577..d01d1cf7809f618e04ead3308defe46ad5df0959 100644 (file)
--- a/lib/inkpot/Makefile.am
+++ b/lib/inkpot/Makefile.am
@@ -53,9 +53,10 @@ inkpot.1.pdf: inkpot.1
 inkpot.3.pdf: inkpot.3
        - $(GROFF) -Tps -man inkpot.3 | $(PS2PDF) - - > inkpot.3.pdf
 
-CLEANFILES = tk.lib svg.lib x11.lib  brewer.lib \
-       inkpot_define.h inkpot_value_table.h inkpot_scheme_table.h
+CLEANFILES = tk.lib svg.lib x11.lib  brewer.lib
 
-EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old scripts/* data/*
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) Makefile.old scripts/* data/* \
+       inkpot_define.h inkpot_value_table.h inkpot_scheme_table.h
 
-DISTCLEANFILES = $(pdf_DATA)
+DISTCLEANFILES = $(pdf_DATA) \
+       inkpot_define.h inkpot_value_table.h inkpot_scheme_table.h

diff --git a/lib/inkpot/inkpot_scheme.c b/lib/inkpot/inkpot_scheme.c
index d5db8bfeb6ab240a5aec5a8ff38529aed42cb48f..a8dcf3966d6b07fe2c3f90859231217a1e5c9c75 100644 (file)
--- a/lib/inkpot/inkpot_scheme.c
+++ b/lib/inkpot/inkpot_scheme.c
@@ -88,6 +88,7 @@ static inkpot_scheme_name_t *inkpot_find_scheme_name ( const char *scheme )
 {
     if (scheme == NULL)
         return NULL;
+    /* FIXME - split scheme/subscheme/n */
     return (inkpot_scheme_name_t *) bsearch(
             (void*)scheme, (void*)TAB_SCHEMES,
             SZT_SCHEMES, sizeof(inkpot_scheme_name_t),
@@ -363,7 +364,7 @@ static inkpot_status_t inkpot_put_name ( inkpot_t *inkpot )
 static inkpot_status_t inkpot_put_index ( inkpot_t *inkpot, int index )
 {
     IDX_SCHEMES_INDEX j;
-    IDX_IXVALUES first, last;
+    IDX_INDEXES first, last;
     IDX_VALUES value_idx;
 
     if (!inkpot->active_schemes)
@@ -372,7 +373,7 @@ static inkpot_status_t inkpot_put_index ( inkpot_t *inkpot, int index )
     j = inkpot->scheme_list[0];
     first = TAB_SCHEMES_INDEX[j].first_value_idx;
     if (++j >= SZT_SCHEMES_INDEX)
-       last = SZT_IXVALUES;
+       last = SZT_INDEXES;
     else
        last = TAB_SCHEMES_INDEX[j].first_value_idx;
     last = last-1-first;
@@ -382,8 +383,8 @@ static inkpot_status_t inkpot_put_index ( inkpot_t *inkpot, int index )
     index = (index > last) ? last : index;
     index += first;
 
-    assert(index < SZT_IXVALUES);
-    value_idx = TAB_IXVALUES[index];
+    assert(index < SZT_INDEXES);
+    value_idx = TAB_INDEXES[index];
     if (value_idx >= SZT_VALUES)
         assert(value_idx < SZT_VALUES + SZT_NONAME_VALUES);
 
@@ -424,7 +425,7 @@ inkpot_status_t inkpot_put ( inkpot_t *inkpot, const char *color )
 {
     inkpot_status_t rc = INKPOT_COLOR_UNKNOWN;
     IDX_SCHEMES_INDEX j;
-    IDX_IXVALUES first, last;
+    IDX_INDEXES first, last;
     IDX_VALUES value_idx;
     char *q, *s;
     const char *p;
@@ -509,7 +510,7 @@ inkpot_status_t inkpot_put ( inkpot_t *inkpot, const char *color )
            /* FIXME - deal with subschemes */
            first = TAB_SCHEMES_INDEX[j].first_value_idx;
             if (++j >= SZT_SCHEMES_INDEX)
-               last = SZT_IXVALUES;
+               last = SZT_INDEXES;
            else
                last = TAB_SCHEMES_INDEX[j].first_value_idx;
            last = last-1-first;
@@ -519,8 +520,8 @@ inkpot_status_t inkpot_put ( inkpot_t *inkpot, const char *color )
            index = (index > last) ? last : index;
            index += first;
 
-           assert(index < SZT_IXVALUES);
-           value_idx = TAB_IXVALUES[index];
+           assert(index < SZT_INDEXES);
+           value_idx = TAB_INDEXES[index];
            if (value_idx >= SZT_VALUES)
                assert(value_idx < SZT_VALUES + SZT_NONAME_VALUES);
 
@@ -842,7 +843,7 @@ static inkpot_status_t inkpot_debug_names_schemes( inkpot_t *inkpot, MSK_SCHEMES
     IDX_NAMES i;
 #if 0
     IDX_SCHEMES_INDEX j;
-    IDX_IXVALUES k, first, last;
+    IDX_INDEXES k, first, last;
     IDX_VALUES v;
     char buf[20];
 #endif
@@ -864,12 +865,12 @@ static inkpot_status_t inkpot_debug_names_schemes( inkpot_t *inkpot, MSK_SCHEMES
        first = scheme_index->first_value_idx;
        j = scheme_index - TAB_SCHEMES_INDEX;
        if (++j >= SZT_SCHEMES_INDEX)
-           last = SZT_IXVALUES;
+           last = SZT_INDEXES;
        else
            last = TAB_SCHEMES_INDEX[j].first_value_idx;
     
        for (k = first; k < last; k++) {
-           v = TAB_IXVALUES[k];
+           v = TAB_INDEXES[k];
            sprintf(buf, "%d(", k - first);
            inkpot_puts(inkpot, buf);
            inkpot_puts(inkpot, &TAB_STRINGS[scheme_index->string_idx]);

diff --git a/lib/inkpot/inkpot_scheme.h b/lib/inkpot/inkpot_scheme.h
index 42685755314b5eb0414c7cc1f18247cbbfab9a70..24559bf8c2c53878363562bf1fcd82a3432672a1 100644 (file)
--- a/lib/inkpot/inkpot_scheme.h
+++ b/lib/inkpot/inkpot_scheme.h
@@ -32,9 +32,9 @@ typedef struct inkpot_scheme_index_s {
        IDX_STRINGS
             subscheme_string_idx; /* The subscheme name in TAB_STRINGS. e.g "blues7" */
 
-       IDX_IXVALUES
+       IDX_INDEXES
            first_value_idx;    /* The first index to the color values in
-                                * TAB_IXVALUES. Terminated by the
+                                * TAB_INDEXES. Terminated by the
                                 * first_value_idx of the next
                                 * inkpot_scheme_index_t in TAB_SCHEMES_INDEX
                                 * or by SZT_SCHEMES_INDEX */
@@ -77,7 +77,7 @@ struct inkpot_s {             /* The Ink Pot */
            scheme_bits,        /* One bit per inkpot_scheme_name_t */
            out_scheme_bit;     /* One scheme only for output. */
 
-       IDX_IXVALUES
+       IDX_INDEXES
            index,              /* The index for the current value in active_schemes_index */
            out_index;          /* The index for the current value in active_out_schemes_index */