adding brewer colors

diff --git a/lib/inkpot/Makefile.am b/lib/inkpot/Makefile.am
index c21dddf3d3eec93c2a5dd4a0d8f324e0d1cd1a14..917b797eec58cab4f9245998d3847144cabe8e8e 100644 (file)
--- a/lib/inkpot/Makefile.am
+++ b/lib/inkpot/Makefile.am
@@ -28,8 +28,12 @@ inkpot_value_table.h: $(builddir)/inkpot_define.h
 
 inkpot_scheme_table.h: $(builddir)/inkpot_define.h
 
-inkpot_define.h: scripts/lib-h.tcl $(builddir)/tk.lib $(builddir)/svg.lib $(builddir)/x11.lib 
-       $(TCLSH) scripts/lib-h.tcl tk.lib svg.lib x11.lib
+inkpot_define.h: scripts/lib-h.tcl \
+                       $(builddir)/tk.lib \
+                               $(builddir)/svg.lib \
+                       $(builddir)/x11.lib \
+                       $(builddir)/brewer.lib
+       $(TCLSH) scripts/lib-h.tcl tk.lib svg.lib x11.lib brewer.lib
 
 x11.lib: scripts/rgb.txt-x11.lib.tcl data/rgb.txt
        $(TCLSH) scripts/rgb.txt-x11.lib.tcl data/rgb.txt
@@ -40,6 +44,9 @@ svg.lib: scripts/types.html-svg.lib.tcl data/types.html
 tk.lib: scripts/xcolors.c-tk.lib.tcl data/xcolors.c
        $(TCLSH) scripts/xcolors.c-tk.lib.tcl data/xcolors.c
 
+brewer.lib: scripts/brewer_colors-brewer.lib.tcl data/brewer_colors
+       $(TCLSH) scripts/brewer_colors-brewer.lib.tcl data/brewer_colors
+
 inkpot.1.pdf: inkpot.1
        - $(GROFF) -Tps -man inkpot.1 | $(PS2PDF) - - > inkpot.1.pdf
 

diff --git a/lib/inkpot/Makefile.old b/lib/inkpot/Makefile.old
index 8ea5af8247b708770447bf82fc8dfb8020457c58..4d0521334af0937fdd2eddc9310d95def5956aef 100644 (file)
--- a/lib/inkpot/Makefile.old
+++ b/lib/inkpot/Makefile.old
@@ -19,7 +19,7 @@ inkpot_value_table.h: inkpot_define.h
 
 inkpot_scheme_table.h: inkpot_define.h
 
-inkpot_define.h: scripts/lib-h.tcl       tk.lib svg.lib x11.lib 
+inkpot_define.h: scripts/lib-h.tcl       tk.lib svg.lib x11.lib brewer.lib
        scripts/lib-h.tcl tk.lib svg.lib x11.lib
 
 x11.lib: scripts/rgb.txt-x11.lib.tcl     data/rgb.txt
@@ -31,6 +31,9 @@ svg.lib: scripts/types.html-svg.lib.tcl  data/types.html
 tk.lib: scripts/xcolors.c-tk.lib.tcl     data/xcolors.c
        scripts/xcolors.c-tk.lib.tcl data/xcolors.c
 
+brewer.lib: scripts/brewer_colors-brewer.lib.tcl data/brewer_colors
+       scripts/brewer_colors-brewer.lib.tcl data/brewer_colors
+
 clean:
-       rm -rf *.o inkpot tk.lib svg.lib x11.lib \
+       rm -rf *.o inkpot tk.lib svg.lib x11.lib brewer.lib \
                inkpot_value_table.h inkpot_scheme_table.h inkpot_define.h