Changeset 536


Ignore:
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:
2 added
1 deleted
4 edited
20 copied

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/Makefile.am

    r522 r536  
    11# $Id$
    22
    3 SUBDIRS = src examples test doc
     3SUBDIRS = cucul caca examples test doc
    44DIST_SUBDIRS = $(SUBDIRS) autotools debian msvc
    55
  • libcaca/trunk/caca/Makefile.am

    r535 r536  
    11# $Id$
    22
    3 include_HEADERS = cucul.h caca.h
     3include_HEADERS = caca.h
    44
    5 lib_LTLIBRARIES = libcucul.la libcaca.la
    6 
    7 libcucul_la_SOURCES = \
    8         cucul.c \
    9         cucul.h \
    10         cucul_internals.h \
    11         char.c \
    12         math.c \
    13         line.c \
    14         box.c \
    15         conic.c \
    16         triangle.c \
    17         sprite.c \
    18         bitmap.c \
    19         export.c \
    20         $(NULL)
    21 libcucul_la_LDFLAGS = -no-undefined
    22 libcucul_la_LIBADD = @CUCUL_LIBS@
     5lib_LTLIBRARIES = libcaca.la
    236
    247libcaca_la_SOURCES = \
     
    3013        time.c \
    3114        $(NULL)
     15libcaca_la_CPPFLAGS = -I$(top_srcdir)/cucul
    3216libcaca_la_LDFLAGS = -no-undefined
    33 libcaca_la_LIBADD = libcucul.la @CACA_LIBS@
     17libcaca_la_LIBADD = ../cucul/libcucul.la @CACA_LIBS@
    3418
  • libcaca/trunk/configure.ac

    r527 r536  
    11# $Id$
    22
    3 AC_INIT(src/caca.c)
     3AC_INIT(caca/caca.c)
    44
    55AC_PREREQ(2.50)
     
    238238AC_CONFIG_FILES([
    239239  Makefile
    240   src/Makefile
     240  cucul/Makefile
     241  caca/Makefile
    241242  examples/Makefile
    242243  test/Makefile
  • libcaca/trunk/cucul/Makefile.am

    r535 r536  
    11# $Id$
    22
    3 include_HEADERS = cucul.h caca.h
     3include_HEADERS = cucul.h
    44
    5 lib_LTLIBRARIES = libcucul.la libcaca.la
     5lib_LTLIBRARIES = libcucul.la
    66
    77libcucul_la_SOURCES = \
     
    2222libcucul_la_LIBADD = @CUCUL_LIBS@
    2323
    24 libcaca_la_SOURCES = \
    25         caca.c \
    26         caca.h \
    27         caca_internals.h \
    28         graphics.c \
    29         event.c \
    30         time.c \
    31         $(NULL)
    32 libcaca_la_LDFLAGS = -no-undefined
    33 libcaca_la_LIBADD = libcucul.la @CACA_LIBS@
    34 
  • libcaca/trunk/cucul/bitmap.c

    r535 r536  
    3939#include "cucul.h"
    4040#include "cucul_internals.h"
    41 #include "caca.h"
    42 #include "caca_internals.h"
    4341
    4442/*
  • libcaca/trunk/examples/Makefile.am

    r524 r536  
    88
    99cacafire_SOURCES = aafire.c
    10 cacafire_LDADD = ../src/libcaca.la @CACA_LIBS@
    11 cacafire_CPPFLAGS = -I$(top_srcdir)/src -DLIBCACA=1
     10cacafire_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
     11cacafire_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DLIBCACA=1
    1212
    1313cacaball_SOURCES = cacaball.c
    14 cacaball_LDADD = ../src/libcaca.la @CACA_LIBS@ @MATH_LIBS@
    15 cacaball_CPPFLAGS = -I$(top_srcdir)/src
     14cacaball_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
     15cacaball_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
    1616
    1717cacaplas_SOURCES = cacaplas.c
    18 cacaplas_LDADD = ../src/libcaca.la @CACA_LIBS@ @MATH_LIBS@
    19 cacaplas_CPPFLAGS = -I$(top_srcdir)/src
     18cacaplas_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
     19cacaplas_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
    2020
    2121cacamoir_SOURCES = cacamoir.c
    22 cacamoir_LDADD = ../src/libcaca.la @CACA_LIBS@ @MATH_LIBS@
    23 cacamoir_CPPFLAGS = -I$(top_srcdir)/src
     22cacamoir_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
     23cacamoir_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
    2424
    2525cacaview_SOURCES = cacaview.c
    26 cacaview_LDADD = ../src/libcaca.la @CACA_LIBS@
    27 cacaview_CPPFLAGS = -I$(top_srcdir)/src -DX_DISPLAY_MISSING=1
     26cacaview_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
     27cacaview_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DX_DISPLAY_MISSING=1
    2828if USE_IMLIB2
    2929cacaview_CFLAGS = `imlib2-config --cflags`
  • libcaca/trunk/test/Makefile.am

    r524 r536  
    44
    55colors_SOURCES = colors.c
    6 colors_LDADD = ../src/libcaca.la @CACA_LIBS@
    7 colors_CPPFLAGS = -I$(top_srcdir)/src
     6colors_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
     7colors_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
    88
    99demo_SOURCES = demo.c
    10 demo_LDADD = ../src/libcaca.la @CACA_LIBS@ @MATH_LIBS@
    11 demo_CPPFLAGS = -I$(top_srcdir)/src -DDATADIR=\"$(pkgdatadir)\"
     10demo_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@ @MATH_LIBS@
     11demo_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
    1212
    1313dithering_SOURCES = dithering.c
    14 dithering_LDADD = ../src/libcaca.la @CACA_LIBS@
    15 dithering_CPPFLAGS = -I$(top_srcdir)/src
     14dithering_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
     15dithering_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
    1616
    1717event_SOURCES = event.c
    18 event_LDADD = ../src/libcaca.la @CACA_LIBS@
    19 event_CPPFLAGS = -I$(top_srcdir)/src
     18event_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
     19event_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
    2020
    2121hsv_SOURCES = hsv.c
    22 hsv_LDADD = ../src/libcaca.la @CACA_LIBS@
    23 hsv_CPPFLAGS = -I$(top_srcdir)/src
     22hsv_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
     23hsv_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
    2424
    2525optipal_SOURCES = optipal.c
    26 optipal_LDADD = ../src/libcucul.la @CUCUL_LIBS@
    27 optipal_CPPFLAGS = -I$(top_srcdir)/src
     26optipal_LDADD = ../cucul/libcucul.la @CUCUL_LIBS@
     27optipal_CPPFLAGS = -I$(top_srcdir)/cucul
    2828
    2929spritedit_SOURCES = spritedit.c
    30 spritedit_LDADD = ../src/libcaca.la @CACA_LIBS@
    31 spritedit_CPPFLAGS = -I$(top_srcdir)/src
     30spritedit_LDADD = ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
     31spritedit_CPPFLAGS = -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
    3232
Note: See TracChangeset for help on using the changeset viewer.