From 8a07f6f08daf325f34eb3b55026100f4d4f2f10a Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Sun, 16 Nov 2003 12:13:46 +0000
Subject: [PATCH]   * 2nd pass in the libcaca rehandling; moved sources to src/
 and examples     to examples/.

---
 Makefile.am                       | 2 +-
 configure.ac                      | 6 +++---
 {test => examples}/Makefile.am    | 6 +++---
 {test => examples}/demo.c         | 0
 {test => examples}/spritedit.c    | 0
 {libcaca => src}/Makefile.am      | 0
 {libcaca => src}/blit.c           | 0
 {libcaca => src}/box.c            | 0
 {libcaca => src}/caca.c           | 0
 {libcaca => src}/caca.h           | 0
 {libcaca => src}/caca_internals.h | 0
 {libcaca => src}/conic.c          | 0
 {libcaca => src}/graphics.c       | 0
 {libcaca => src}/io.c             | 0
 {libcaca => src}/line.c           | 4 ++--
 {libcaca => src}/math.c           | 0
 {libcaca => src}/sprite.c         | 0
 {libcaca => src}/triangle.c       | 0
 18 files changed, 9 insertions(+), 9 deletions(-)
 rename {test => examples}/Makefile.am (71%)
 rename {test => examples}/demo.c (100%)
 rename {test => examples}/spritedit.c (100%)
 rename {libcaca => src}/Makefile.am (100%)
 rename {libcaca => src}/blit.c (100%)
 rename {libcaca => src}/box.c (100%)
 rename {libcaca => src}/caca.c (100%)
 rename {libcaca => src}/caca.h (100%)
 rename {libcaca => src}/caca_internals.h (100%)
 rename {libcaca => src}/conic.c (100%)
 rename {libcaca => src}/graphics.c (100%)
 rename {libcaca => src}/io.c (100%)
 rename {libcaca => src}/line.c (98%)
 rename {libcaca => src}/math.c (100%)
 rename {libcaca => src}/sprite.c (100%)
 rename {libcaca => src}/triangle.c (100%)

diff --git a/Makefile.am b/Makefile.am
index 531ee21..6735677 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 # Automake targets and declarations for libcaca
 ###############################################################################
 
-SUBDIRS = libcaca test
+SUBDIRS = src examples
 DIST_SUBDIRS = $(SUBDIRS) autotools debian
 
 EXTRA_DIST = BUGS bootstrap
diff --git a/configure.ac b/configure.ac
index 955b7a1..fd61d46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 AC_INIT(libcaca,0.0cvs-20031110)
 
 AC_PREREQ(2.50)
-AC_CONFIG_SRCDIR(src/main.c)
+AC_CONFIG_SRCDIR(src/caca.c)
 AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_SYSTEM
 
@@ -60,8 +60,8 @@ CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-protot
 
 AC_OUTPUT([
   Makefile
-  libcaca/Makefile
-  test/Makefile
+  src/Makefile
+  examples/Makefile
   autotools/Makefile
   debian/Makefile
 ])
diff --git a/test/Makefile.am b/examples/Makefile.am
similarity index 71%
rename from test/Makefile.am
rename to examples/Makefile.am
index 2bf7e4f..c5cd9dd 100644
--- a/test/Makefile.am
+++ b/examples/Makefile.am
@@ -2,7 +2,7 @@
 # Automake targets and declarations for libcaca tests
 ###############################################################################
 
-AM_CPPFLAGS = -I$(top_srcdir)/libcaca
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 if USE_SLANG
 LDFLAGS_slang = -lslang
@@ -14,10 +14,10 @@ endif
 bin_PROGRAMS = demo spritedit
 
 demo_SOURCES = demo.c
-demo_LDADD = ../libcaca/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
+demo_LDADD = ../src/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
 demo_CFLAGS = `pkg-config --cflags gtk+-2.0`
 demo_LDFLAGS = `pkg-config --libs gtk+-2.0`
 
 spritedit_SOURCES = spritedit.c
-spritedit_LDADD = ../libcaca/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
+spritedit_LDADD = ../src/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
 
diff --git a/test/demo.c b/examples/demo.c
similarity index 100%
rename from test/demo.c
rename to examples/demo.c
diff --git a/test/spritedit.c b/examples/spritedit.c
similarity index 100%
rename from test/spritedit.c
rename to examples/spritedit.c
diff --git a/libcaca/Makefile.am b/src/Makefile.am
similarity index 100%
rename from libcaca/Makefile.am
rename to src/Makefile.am
diff --git a/libcaca/blit.c b/src/blit.c
similarity index 100%
rename from libcaca/blit.c
rename to src/blit.c
diff --git a/libcaca/box.c b/src/box.c
similarity index 100%
rename from libcaca/box.c
rename to src/box.c
diff --git a/libcaca/caca.c b/src/caca.c
similarity index 100%
rename from libcaca/caca.c
rename to src/caca.c
diff --git a/libcaca/caca.h b/src/caca.h
similarity index 100%
rename from libcaca/caca.h
rename to src/caca.h
diff --git a/libcaca/caca_internals.h b/src/caca_internals.h
similarity index 100%
rename from libcaca/caca_internals.h
rename to src/caca_internals.h
diff --git a/libcaca/conic.c b/src/conic.c
similarity index 100%
rename from libcaca/conic.c
rename to src/conic.c
diff --git a/libcaca/graphics.c b/src/graphics.c
similarity index 100%
rename from libcaca/graphics.c
rename to src/graphics.c
diff --git a/libcaca/io.c b/src/io.c
similarity index 100%
rename from libcaca/io.c
rename to src/io.c
diff --git a/libcaca/line.c b/src/line.c
similarity index 98%
rename from libcaca/line.c
rename to src/line.c
index c5fe7f2..6e112b8 100644
--- a/libcaca/line.c
+++ b/src/line.c
@@ -195,12 +195,12 @@ static uint8_t clip_bits(int x, int y)
 
     if(x < 0)
         b |= (1<<0);
-    else if(x >= caca_get_width())
+    else if(x >= (int)caca_get_width())
         b |= (1<<1);
 
     if(y < 0)
         b |= (1<<2);
-    else if(y >= caca_get_height())
+    else if(y >= (int)caca_get_height())
         b |= (1<<3);
 
     return b;
diff --git a/libcaca/math.c b/src/math.c
similarity index 100%
rename from libcaca/math.c
rename to src/math.c
diff --git a/libcaca/sprite.c b/src/sprite.c
similarity index 100%
rename from libcaca/sprite.c
rename to src/sprite.c
diff --git a/libcaca/triangle.c b/src/triangle.c
similarity index 100%
rename from libcaca/triangle.c
rename to src/triangle.c