Changeset 536Tweet

Timestamp:

Mar 6, 2006, 9:57:14 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Moved stuff around to differenciate between libcucul and libcaca.

Location:

libcaca/trunk

Files:

• Makefile.am (modified) (1 diff)
• caca (added)
• caca/Makefile.am (copied) (copied from libcaca/trunk/src/Makefile.am) (2 diffs)
• caca/caca.c (copied) (copied from libcaca/trunk/src/caca.c)
• caca/caca.h (copied) (copied from libcaca/trunk/src/caca.h)
• caca/caca_internals.h (copied) (copied from libcaca/trunk/src/caca_internals.h)
• caca/event.c (copied) (copied from libcaca/trunk/src/event.c)
• caca/graphics.c (copied) (copied from libcaca/trunk/src/graphics.c)
• caca/time.c (copied) (copied from libcaca/trunk/src/time.c)
• configure.ac (modified) (2 diffs)
• cucul (added)
• cucul/Makefile.am (copied) (copied from libcaca/trunk/src/Makefile.am) (2 diffs)
• cucul/bitmap.c (copied) (copied from libcaca/trunk/src/bitmap.c) (1 diff)
• cucul/box.c (copied) (copied from libcaca/trunk/src/box.c)
• cucul/char.c (copied) (copied from libcaca/trunk/src/char.c)
• cucul/conic.c (copied) (copied from libcaca/trunk/src/conic.c)
• cucul/cucul.c (copied) (copied from libcaca/trunk/src/cucul.c)
• cucul/cucul.h (copied) (copied from libcaca/trunk/src/cucul.h)
• cucul/cucul_internals.h (copied) (copied from libcaca/trunk/src/cucul_internals.h)
• cucul/export.c (copied) (copied from libcaca/trunk/src/export.c)
• cucul/line.c (copied) (copied from libcaca/trunk/src/line.c)
• cucul/math.c (copied) (copied from libcaca/trunk/src/math.c)
• cucul/sprite.c (copied) (copied from libcaca/trunk/src/sprite.c)
• cucul/triangle.c (copied) (copied from libcaca/trunk/src/triangle.c)
• examples/Makefile.am (modified) (1 diff)
• src (deleted)
• test/Makefile.am (modified) (1 diff)

libcaca/trunk/Makefile.am

@@ -1 +1 @@
 # $Id$
 
-SUBDIRS = src examples test doc
+SUBDIRS = cucul caca examples test doc
 DIST_SUBDIRS = $(SUBDIRS) autotools debian msvc
 

libcaca/trunk/caca/Makefile.am

@@ -1 +1 @@
 # $Id$
 
-include_HEADERS = cucul.h caca.h
+include_HEADERS = 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@
+lib_LTLIBRARIES = libcaca.la
 
 libcaca_la_SOURCES = \
@@ -30 +13 @@
         time.c \
         $(NULL)
+libcaca_la_CPPFLAGS = -I$(top_srcdir)/cucul
 libcaca_la_LDFLAGS = -no-undefined
-libcaca_la_LIBADD = libcucul.la @CACA_LIBS@
+libcaca_la_LIBADD = ../cucul/libcucul.la @CACA_LIBS@
 

libcaca/trunk/configure.ac

@@ -1 +1 @@
 # $Id$
 
-AC_INIT(src/caca.c)
+AC_INIT(caca/caca.c)
 
 AC_PREREQ(2.50)
@@ -238 +238 @@
 AC_CONFIG_FILES([
   Makefile
-  src/Makefile
+  cucul/Makefile
+  caca/Makefile
   examples/Makefile
   test/Makefile

libcaca/trunk/cucul/Makefile.am

@@ -1 +1 @@
 # $Id$
 
-include_HEADERS = cucul.h caca.h
+include_HEADERS = cucul.h
 
-lib_LTLIBRARIES = libcucul.la libcaca.la
+lib_LTLIBRARIES = libcucul.la
 
 libcucul_la_SOURCES = \
@@ -22 +22 @@
 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@
-

libcaca/trunk/cucul/bitmap.c

@@ -39 +39 @@
 #include "cucul.h"
 #include "cucul_internals.h"
-#include "caca.h"
-#include "caca_internals.h"
 
 /*

libcaca/trunk/examples/Makefile.am

@@ -8 +8 @@
 
 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`

libcaca/trunk/test/Makefile.am

@@ -4 +4 @@
 
 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