Changeset 475


Ignore:
Timestamp:
Mar 26, 2005, 11:27:30 AM (16 years ago)
Author:
Sam Hocevar
Message:
  • Use libtool for the static library generation; paves the way for a future shared library.
Location:
libcaca/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/bootstrap

    r367 r475  
    3838fi
    3939
     40libtoolize="no"
     41if glibtoolize --version >/dev/null 2>&1; then
     42  libtoolize="glibtoolize"
     43elif libtoolize --version >/dev/null 2>&1; then
     44  libtoolize="libtoolize"
     45fi
     46
     47if test "$libtoolize" = "no"; then
     48  set +x
     49  echo "$0: you need libtool"
     50  exit 1
     51fi
     52
    4053# Remove old cruft
    4154rm -f aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh INSTALL
    4255rm -Rf autom4te.cache
    4356(cd autotools && rm -f config.guess config.sub missing mkinstalldirs compile ltmain.sh depcomp install-sh)
     57
     58${libtoolize} --copy --force
     59if test -f "ltmain.sh"; then
     60  echo "$0: working around a minor libtool issue"
     61  mv ltmain.sh autotools/
     62fi
    4463
    4564aclocal${amvers}
  • libcaca/trunk/configure.ac

    r364 r475  
    1212AM_PROG_CC_C_O
    1313AC_PROG_CPP
    14 AC_PROG_RANLIB
     14
     15AC_LIBTOOL_WIN32_DLL
     16AC_DISABLE_SHARED
     17AM_PROG_LIBTOOL
    1518
    1619AC_C_CONST
  • libcaca/trunk/examples/Makefile.am

    r342 r475  
    88
    99cacademo_SOURCES = demo.c
    10 cacademo_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@
     10cacademo_LDADD = ../src/libcaca.la @CACA_LIBS@ @MATH_LIBS@
    1111cacademo_CPPFLAGS = -I$(top_srcdir)/src -DDATADIR=\"$(pkgdatadir)\"
    1212
    1313cacafire_SOURCES = aafire.c
    14 cacafire_LDADD = ../src/libcaca.a @CACA_LIBS@
     14cacafire_LDADD = ../src/libcaca.la @CACA_LIBS@
    1515cacafire_CPPFLAGS = -I$(top_srcdir)/src -DLIBCACA=1
    1616
    1717cacaball_SOURCES = cacaball.c
    18 cacaball_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@
     18cacaball_LDADD = ../src/libcaca.la @CACA_LIBS@ @MATH_LIBS@
    1919cacaball_CPPFLAGS = -I$(top_srcdir)/src
    2020
    2121cacaplas_SOURCES = cacaplas.c
    22 cacaplas_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@
     22cacaplas_LDADD = ../src/libcaca.la @CACA_LIBS@ @MATH_LIBS@
    2323cacaplas_CPPFLAGS = -I$(top_srcdir)/src
    2424
    2525cacamoir_SOURCES = cacamoir.c
    26 cacamoir_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@
     26cacamoir_LDADD = ../src/libcaca.la @CACA_LIBS@ @MATH_LIBS@
    2727cacamoir_CPPFLAGS = -I$(top_srcdir)/src
    2828
    2929cacaview_SOURCES = cacaview.c
    30 cacaview_LDADD = ../src/libcaca.a @CACA_LIBS@
     30cacaview_LDADD = ../src/libcaca.la @CACA_LIBS@
    3131cacaview_CPPFLAGS = -I$(top_srcdir)/src -DX_DISPLAY_MISSING=1
    3232if USE_IMLIB2
  • libcaca/trunk/src/Makefile.am

    r345 r475  
    33include_HEADERS = caca.h
    44
    5 lib_LIBRARIES = libcaca.a $(libcaca_pic_a)
    6 libcaca_a_SOURCES = \
     5lib_LTLIBRARIES = libcaca.la
     6libcaca_la_SOURCES = \
    77        caca.c \
    88        caca.h \
     
    1919        time.c \
    2020        $(NULL)
     21libcaca_la_LDFLAGS = -no-undefined
     22libcaca_la_LIBADD = @CACA_LIBS@
    2123
    2224if NEED_PIC
    2325libcaca_pic_a = libcaca_pic.a
    2426endif
    25 libcaca_pic_a_SOURCES = $(libcaca_a_SOURCES)
     27lib_LIBRARIES = $(libcaca_pic_a)
     28libcaca_pic_a_SOURCES = $(libcaca_la_SOURCES)
    2629libcaca_pic_a_CPPFLAGS = -fPIC -DPIC
    2730
  • libcaca/trunk/test/Makefile.am

    r350 r475  
    44
    55colors_SOURCES = colors.c
    6 colors_LDADD = ../src/libcaca.a @CACA_LIBS@
     6colors_LDADD = ../src/libcaca.la @CACA_LIBS@
    77colors_CPPFLAGS = -I$(top_srcdir)/src
    88
    99dithering_SOURCES = dithering.c
    10 dithering_LDADD = ../src/libcaca.a @CACA_LIBS@
     10dithering_LDADD = ../src/libcaca.la @CACA_LIBS@
    1111dithering_CPPFLAGS = -I$(top_srcdir)/src
    1212
    1313event_SOURCES = event.c
    14 event_LDADD = ../src/libcaca.a @CACA_LIBS@
     14event_LDADD = ../src/libcaca.la @CACA_LIBS@
    1515event_CPPFLAGS = -I$(top_srcdir)/src
    1616
    1717hsv_SOURCES = hsv.c
    18 hsv_LDADD = ../src/libcaca.a @CACA_LIBS@
     18hsv_LDADD = ../src/libcaca.la @CACA_LIBS@
    1919hsv_CPPFLAGS = -I$(top_srcdir)/src
    2020
    2121optipal_SOURCES = optipal.c
    22 optipal_LDADD = ../src/libcaca.a @CACA_LIBS@
     22optipal_LDADD = ../src/libcaca.la @CACA_LIBS@
    2323optipal_CPPFLAGS = -I$(top_srcdir)/src
    2424
    2525spritedit_SOURCES = spritedit.c
    26 spritedit_LDADD = ../src/libcaca.a @CACA_LIBS@
     26spritedit_LDADD = ../src/libcaca.la @CACA_LIBS@
    2727spritedit_CPPFLAGS = -I$(top_srcdir)/src
    2828
Note: See TracChangeset for help on using the changeset viewer.