* Moved test/optipal.c to tools/optipal.c. The tools subdirectory will

contain development tools that are only useful to libcaca developers.

Makefile.am

@@ -1,6 +1,6 @@
 # $Id$
 
-SUBDIRS = kernel cucul caca src test doc
+SUBDIRS = kernel cucul caca src test tools doc
 DIST_SUBDIRS = $(SUBDIRS) autotools debian msvc
 
 EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in libcaca.spec

caca/driver_slang.c

@@ -43,7 +43,7 @@
  * Global variables
  */
 
-/* Tables generated by test/optipal.c */
+/* Tables generated by tools/optipal.c */
 static int const slang_palette[2*16*16] =
 {
      1,  0,   2,  0,   3,  0,   4,  0,   5,  0,   6,  0,   7,  0,   8,  0,

configure.ac

@@ -292,6 +292,7 @@ AC_CONFIG_FILES([
   caca/Makefile
   src/Makefile
   test/Makefile
+  tools/Makefile
   doc/Makefile
   autotools/Makefile
   debian/Makefile

test/Makefile.am

@@ -2,7 +2,7 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
 
-noinst_PROGRAMS = colors demo dithering event export gamma hsv optipal spritedit transform unicode
+noinst_PROGRAMS = colors demo dithering event export gamma hsv spritedit transform unicode
 
 colors_SOURCES = colors.c
 colors_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
@@ -25,9 +25,6 @@ gamma_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
 hsv_SOURCES = hsv.c
 hsv_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
 
-optipal_SOURCES = optipal.c
-optipal_LDADD = ../cucul/libcucul.la @CUCUL_LIBS@
-
 spritedit_SOURCES = spritedit.c
 spritedit_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
 

tools/Makefile.am

@@ -0,0 +1,8 @@
+# $Id$
+
+AM_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
+
+noinst_PROGRAMS = optipal
+
+optipal_SOURCES = optipal.c
+

test/optipal.c → tools/optipal.c

@@ -1,5 +1,5 @@
 /*
- *  optipal       S-Lang optimised palette generator for libcucul
+ *  optipal       S-Lang optimised palette generator for libcaca
  *  Copyright (c) 2003 Sam Hocevar <sam@zoy.org>
  *                All Rights Reserved
  *
@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 
-#include "cucul.h"
+#include "cucul.h" /* Only necessary for CUCUL_* macros */
 
 static void base_colors(void);
 static void emulated_colors(void);