From 4f59010b4cae46df2ffff8adbb671eb2db4d7f1a Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Mon, 6 Mar 2006 20:57:14 +0000
Subject: [PATCH]   * Moved stuff around to differenciate between libcucul and
 libcaca.

---
 Makefile.am                      |  2 +-
 caca/Makefile.am                 | 18 +++++++++++++++++
 {src => caca}/caca.c             |  0
 {src => caca}/caca.h             |  0
 {src => caca}/caca_internals.h   |  0
 {src => caca}/event.c            |  0
 {src => caca}/graphics.c         |  0
 {src => caca}/time.c             |  0
 configure.ac                     |  5 +++--
 cucul/Makefile.am                | 23 +++++++++++++++++++++
 {src => cucul}/bitmap.c          |  2 --
 {src => cucul}/box.c             |  0
 {src => cucul}/char.c            |  0
 {src => cucul}/conic.c           |  0
 {src => cucul}/cucul.c           |  0
 {src => cucul}/cucul.h           |  0
 {src => cucul}/cucul_internals.h |  0
 {src => cucul}/export.c          |  0
 {src => cucul}/line.c            |  0
 {src => cucul}/math.c            |  0
 {src => cucul}/sprite.c          |  0
 {src => cucul}/triangle.c        |  0
 examples/Makefile.am             | 20 +++++++++----------
 src/Makefile.am                  | 34 --------------------------------
 test/Makefile.am                 | 28 +++++++++++++-------------
 25 files changed, 69 insertions(+), 63 deletions(-)
 create mode 100644 caca/Makefile.am
 rename {src => caca}/caca.c (100%)
 rename {src => caca}/caca.h (100%)
 rename {src => caca}/caca_internals.h (100%)
 rename {src => caca}/event.c (100%)
 rename {src => caca}/graphics.c (100%)
 rename {src => caca}/time.c (100%)
 create mode 100644 cucul/Makefile.am
 rename {src => cucul}/bitmap.c (99%)
 rename {src => cucul}/box.c (100%)
 rename {src => cucul}/char.c (100%)
 rename {src => cucul}/conic.c (100%)
 rename {src => cucul}/cucul.c (100%)
 rename {src => cucul}/cucul.h (100%)
 rename {src => cucul}/cucul_internals.h (100%)
 rename {src => cucul}/export.c (100%)
 rename {src => cucul}/line.c (100%)
 rename {src => cucul}/math.c (100%)
 rename {src => cucul}/sprite.c (100%)
 rename {src => cucul}/triangle.c (100%)
 delete mode 100644 src/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b6dc548..e3ee56f 100644
--- a/Makefile.am
+++ b/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
diff --git a/caca/Makefile.am b/caca/Makefile.am
new file mode 100644
index 0000000..702a576
--- /dev/null
+++ b/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@
+
diff --git a/src/caca.c b/caca/caca.c
similarity index 100%
rename from src/caca.c
rename to caca/caca.c
diff --git a/src/caca.h b/caca/caca.h
similarity index 100%
rename from src/caca.h
rename to caca/caca.h
diff --git a/src/caca_internals.h b/caca/caca_internals.h
similarity index 100%
rename from src/caca_internals.h
rename to caca/caca_internals.h
diff --git a/src/event.c b/caca/event.c
similarity index 100%
rename from src/event.c
rename to caca/event.c
diff --git a/src/graphics.c b/caca/graphics.c
similarity index 100%
rename from src/graphics.c
rename to caca/graphics.c
diff --git a/src/time.c b/caca/time.c
similarity index 100%
rename from src/time.c
rename to caca/time.c
diff --git a/configure.ac b/configure.ac
index d276972..70e87cb 100644
--- a/configure.ac
+++ b/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
diff --git a/cucul/Makefile.am b/cucul/Makefile.am
new file mode 100644
index 0000000..bb2c2e4
--- /dev/null
+++ b/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@
+
diff --git a/src/bitmap.c b/cucul/bitmap.c
similarity index 99%
rename from src/bitmap.c
rename to cucul/bitmap.c
index 416e007..9707654 100644
--- a/src/bitmap.c
+++ b/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
diff --git a/src/box.c b/cucul/box.c
similarity index 100%
rename from src/box.c
rename to cucul/box.c
diff --git a/src/char.c b/cucul/char.c
similarity index 100%
rename from src/char.c
rename to cucul/char.c
diff --git a/src/conic.c b/cucul/conic.c
similarity index 100%
rename from src/conic.c
rename to cucul/conic.c
diff --git a/src/cucul.c b/cucul/cucul.c
similarity index 100%
rename from src/cucul.c
rename to cucul/cucul.c
diff --git a/src/cucul.h b/cucul/cucul.h
similarity index 100%
rename from src/cucul.h
rename to cucul/cucul.h
diff --git a/src/cucul_internals.h b/cucul/cucul_internals.h
similarity index 100%
rename from src/cucul_internals.h
rename to cucul/cucul_internals.h
diff --git a/src/export.c b/cucul/export.c
similarity index 100%
rename from src/export.c
rename to cucul/export.c
diff --git a/src/line.c b/cucul/line.c
similarity index 100%
rename from src/line.c
rename to cucul/line.c
diff --git a/src/math.c b/cucul/math.c
similarity index 100%
rename from src/math.c
rename to cucul/math.c
diff --git a/src/sprite.c b/cucul/sprite.c
similarity index 100%
rename from src/sprite.c
rename to cucul/sprite.c
diff --git a/src/triangle.c b/cucul/triangle.c
similarity index 100%
rename from src/triangle.c
rename to cucul/triangle.c
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 7dfa94b..768398f 100644
--- a/examples/Makefile.am
+++ b/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`
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index f6850ac..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -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@
-
diff --git a/test/Makefile.am b/test/Makefile.am
index 60940b2..e0bb29d 100644
--- a/test/Makefile.am
+++ b/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