* Moved stuff around to differenciate between libcucul and libcaca.

Makefile.am

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

caca/Makefile.am

@@ -0,0 +1,18 @@
+# $Id$
+
+include_HEADERS = caca.h
+
+lib_LTLIBRARIES = libcaca.la
+
+libcaca_la_SOURCES = \
+	caca.c \
+	caca.h \
+	caca_internals.h \
+	graphics.c \
+	event.c \
+	time.c \
+	$(NULL)
+libcaca_la_CPPFLAGS = -I$(top_srcdir)/cucul
+libcaca_la_LDFLAGS = -no-undefined
+libcaca_la_LIBADD = ../cucul/libcucul.la @CACA_LIBS@
+

configure.ac

@@ -1,6 +1,6 @@
 # $Id$
 
-AC_INIT(src/caca.c)
+AC_INIT(caca/caca.c)
 
 AC_PREREQ(2.50)
 AC_CONFIG_AUX_DIR(autotools)
@@ -237,7 +237,8 @@ AM_CONDITIONAL(USE_LATEX, test "${LATEX}" != "no")
 
 AC_CONFIG_FILES([
   Makefile
-  src/Makefile
+  cucul/Makefile
+  caca/Makefile
   examples/Makefile
   test/Makefile
   doc/Makefile

cucul/Makefile.am

@@ -0,0 +1,23 @@
+# $Id$
+
+include_HEADERS = cucul.h
+
+lib_LTLIBRARIES = libcucul.la
+
+libcucul_la_SOURCES = \
+	cucul.c \
+	cucul.h \
+	cucul_internals.h \
+	char.c \
+	math.c \
+	line.c \
+	box.c \
+	conic.c \
+	triangle.c \
+	sprite.c \
+	bitmap.c \
+	export.c \
+	$(NULL)
+libcucul_la_LDFLAGS = -no-undefined
+libcucul_la_LIBADD = @CUCUL_LIBS@
+

src/bitmap.c → cucul/bitmap.c

@@ -38,8 +38,6 @@ typedef unsigned int uint32_t;
 
 #include "cucul.h"
 #include "cucul_internals.h"
-#include "caca.h"
-#include "caca_internals.h"
 
 /*
  * Local variables

examples/Makefile.am

@@ -7,24 +7,24 @@ EXTRA_DIST = caca.txt
 bin_PROGRAMS = cacafire cacaball cacaplas cacaview cacamoir
 
 cacafire_SOURCES = aafire.c
-cacafire_LDADD = ../src/libcaca.la @CACA_LIBS@
-cacafire_CPPFLAGS = -I$(top_srcdir)/src -DLIBCACA=1
+cacafire_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
+cacafire_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DLIBCACA=1
 
 cacaball_SOURCES = cacaball.c
-cacaball_LDADD = ../src/libcaca.la @CACA_LIBS@ @MATH_LIBS@
-cacaball_CPPFLAGS = -I$(top_srcdir)/src
+cacaball_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
+cacaball_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 cacaplas_SOURCES = cacaplas.c
-cacaplas_LDADD = ../src/libcaca.la @CACA_LIBS@ @MATH_LIBS@
-cacaplas_CPPFLAGS = -I$(top_srcdir)/src
+cacaplas_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
+cacaplas_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 cacamoir_SOURCES = cacamoir.c
-cacamoir_LDADD = ../src/libcaca.la @CACA_LIBS@ @MATH_LIBS@
-cacamoir_CPPFLAGS = -I$(top_srcdir)/src
+cacamoir_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
+cacamoir_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 cacaview_SOURCES = cacaview.c
-cacaview_LDADD = ../src/libcaca.la @CACA_LIBS@
-cacaview_CPPFLAGS = -I$(top_srcdir)/src -DX_DISPLAY_MISSING=1
+cacaview_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
+cacaview_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DX_DISPLAY_MISSING=1
 if USE_IMLIB2
 cacaview_CFLAGS = `imlib2-config --cflags`
 cacaview_LDFLAGS = `imlib2-config --libs`

src/Makefile.am

@@ -1,34 +0,0 @@
-# $Id$
-
-include_HEADERS = cucul.h caca.h
-
-lib_LTLIBRARIES = libcucul.la libcaca.la
-
-libcucul_la_SOURCES = \
-	cucul.c \
-	cucul.h \
-	cucul_internals.h \
-	char.c \
-	math.c \
-	line.c \
-	box.c \
-	conic.c \
-	triangle.c \
-	sprite.c \
-	bitmap.c \
-	export.c \
-	$(NULL)
-libcucul_la_LDFLAGS = -no-undefined
-libcucul_la_LIBADD = @CUCUL_LIBS@
-
-libcaca_la_SOURCES = \
-	caca.c \
-	caca.h \
-	caca_internals.h \
-	graphics.c \
-	event.c \
-	time.c \
-	$(NULL)
-libcaca_la_LDFLAGS = -no-undefined
-libcaca_la_LIBADD = libcucul.la @CACA_LIBS@
-

test/Makefile.am

@@ -3,30 +3,30 @@
 noinst_PROGRAMS = colors demo dithering event hsv optipal spritedit
 
 colors_SOURCES = colors.c
-colors_LDADD = ../src/libcaca.la @CACA_LIBS@
-colors_CPPFLAGS = -I$(top_srcdir)/src
+colors_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
+colors_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 demo_SOURCES = demo.c
-demo_LDADD = ../src/libcaca.la @CACA_LIBS@ @MATH_LIBS@
-demo_CPPFLAGS = -I$(top_srcdir)/src -DDATADIR=\"$(pkgdatadir)\"
+demo_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
+demo_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
 
 dithering_SOURCES = dithering.c
-dithering_LDADD = ../src/libcaca.la @CACA_LIBS@
-dithering_CPPFLAGS = -I$(top_srcdir)/src
+dithering_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
+dithering_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 event_SOURCES = event.c
-event_LDADD = ../src/libcaca.la @CACA_LIBS@
-event_CPPFLAGS = -I$(top_srcdir)/src
+event_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
+event_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 hsv_SOURCES = hsv.c
-hsv_LDADD = ../src/libcaca.la @CACA_LIBS@
-hsv_CPPFLAGS = -I$(top_srcdir)/src
+hsv_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
+hsv_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
 
 optipal_SOURCES = optipal.c
-optipal_LDADD = ../src/libcucul.la @CUCUL_LIBS@
-optipal_CPPFLAGS = -I$(top_srcdir)/src
+optipal_LDADD = ../cucul/libcucul.la @CUCUL_LIBS@
+optipal_CPPFLAGS = -I$(top_srcdir)/cucul
 
 spritedit_SOURCES = spritedit.c
-spritedit_LDADD = ../src/libcaca.la @CACA_LIBS@
-spritedit_CPPFLAGS = -I$(top_srcdir)/src
+spritedit_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
+spritedit_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca