* 2nd pass in the libcaca rehandling; moved sources to src/ and examples

to examples/.

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

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
 ])

test/Makefile.am → 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
 

libcaca/line.c → 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;