Ignore:
Timestamp:
Sep 27, 2008, 3:12:46 PM (11 years ago)
Author:
Sam Hocevar
Message:

Starting refactoring to get rid of libcucul. The initial reason for the
split is rendered moot by the plugin system: when enabled, binaries do
not link directly with libX11 or libGL. I hope this is a step towards
more consisteny and clarity.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/caca/Makefile.am

    r2517 r2821  
    11# $Id$
    22
    3 EXTRA_DIST = caca.pc.in
    4 DISTCLEANFILES = caca.pc
     3EXTRA_DIST = caca_types.h.in caca.pc.in mono9.data monobold12.data
     4DISTCLEANFILES = caca_types.h caca.pc
    55
    6 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul \
    7               -DPLUGINDIR=\"$(plugindir)\"
     6AM_CPPFLAGS = -I$(top_srcdir) -DPLUGINDIR=\"$(plugindir)\"
    87
    98pkgconfig_DATA = caca.pc
    109pkgconfigdir = $(libdir)/pkgconfig
    1110
    12 include_HEADERS = caca.h caca0.h
     11include_HEADERS = caca.h caca_types.h caca0.h
    1312
    1413lib_LTLIBRARIES = libcaca.la
     
    1716        caca.c \
    1817        caca.h \
     18        caca_types.h \
    1919        caca_internals.h \
    2020        caca0.c \
    2121        caca0.h \
     22        canvas.c \
     23        string.c \
     24        legacy.c \
     25        transform.c \
     26        charset.c \
     27        attr.c \
     28        line.c \
     29        box.c \
     30        conic.c \
     31        triangle.c \
     32        frame.c \
     33        dither.c \
     34        font.c \
     35        import.c \
     36        export.c \
     37        file.c \
     38        figfont.c \
    2239        graphics.c \
    2340        event.c \
     
    3249        $(extra_source) \
    3350        $(NULL)
     51libcaca_la_DEPENDENCIES = \
     52        mono9.data \
     53        monobold12.data \
     54        $(NULL)
    3455libcaca_la_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@
    3556libcaca_la_LDFLAGS = -no-undefined -version-number @LT_VERSION@
    36 libcaca_la_LIBADD = ../cucul/libcucul.la @CACA_LIBS@
     57libcaca_la_LIBADD = @CACA_LIBS@ $(ZLIB_LIBS)
    3758
    3859if USE_PLUGINS
     
    4364libx11_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(X11_CFLAGS)
    4465libx11_plugin_la_LDFLAGS = -no-undefined -module -no-version
    45 libx11_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la $(X11_LIBS)
     66libx11_plugin_la_LIBADD = libcaca.la $(X11_LIBS)
    4667
    4768libgl_plugin_la_SOURCES = driver_gl.c
    4869libgl_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(GL_CFLAGS) #$(FTGL_CFLAGS)
    4970libgl_plugin_la_LDFLAGS = -no-undefined -module -no-version
    50 libgl_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la $(GL_LIBS) #$(FTGL_LIBS)
     71libgl_plugin_la_LIBADD = libcaca.la $(GL_LIBS) #$(FTGL_LIBS)
    5172else
    5273extra_source = driver_x11.c driver_gl.c
Note: See TracChangeset for help on using the changeset viewer.