Changeset 4820 for libcaca


Ignore:
Timestamp:
Jun 17, 2012, 2:36:15 PM (7 years ago)
Author:
Sam Hocevar
Message:

build: disable subdir-objects option because it makes the distclean rule fail.

Location:
libcaca/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/configure.ac

    r4819 r4820  
    44AC_CONFIG_AUX_DIR(.auto)
    55AC_CANONICAL_SYSTEM
    6 AM_INIT_AUTOMAKE([subdir-objects no-define tar-ustar silent-rules])
     6dnl  We cannot use subdir-objects because of a bug that will eg. remove
     7dnl  ../src/.deps upon distclean when a file from ../src/ is used.
     8AM_INIT_AUTOMAKE([no-define tar-ustar silent-rules])
    79dnl AM_MAINTAINER_MODE
    810
     
    3638AC_TYPE_SIGNAL
    3739
    38 dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right
    39 dnl now otherwise it might be set in an obscure if statement. Same thing for
    40 dnl PKG_PROG_PKG_CONFIG which needs to be called first.
     40dnl  AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right
     41dnl  now otherwise it might be set in an obscure if statement. Same thing for
     42dnl  PKG_PROG_PKG_CONFIG which needs to be called first.
    4143AC_EGREP_CPP(yes, foo)
    4244PKG_PROG_PKG_CONFIG()
     
    5557AC_SUBST(LT_SUFFIX)
    5658
    57 dnl global configuration features
     59dnl  global configuration features
    5860AC_ARG_ENABLE(kernel,
    5961  [  --enable-kernel         kernel mode (default no)])
    6062
    61 dnl output driver features
     63dnl  output driver features
    6264AC_ARG_ENABLE(slang,
    6365  [  --enable-slang          slang graphics support (autodetected)])
     
    7981  [  --enable-vga            VGA support for kernel mode (autodetected)])
    8082
    81 dnl language bindings
     83dnl  language bindings
    8284AC_ARG_ENABLE(csharp,
    8385  [  --enable-csharp         C# bindings (autodetected)])
     
    9193  [  --enable-ruby           Ruby bindings (autodetected)])
    9294
    93 dnl example programs features
     95dnl  example programs features
    9496AC_ARG_ENABLE(imlib2,
    9597  [  --enable-imlib2         Imlib2 graphics support (autodetected)])
    9698
    97 dnl conditional builds
     99dnl  conditional builds
    98100AC_ARG_ENABLE(debug,
    99101  [  --enable-debug          build debug versions of the library (default no)])
  • libcaca/trunk/src/Makefile.am

    r4804 r4820  
    3434
    3535
    36 img2txt_SOURCES = img2txt.c $(GETOPT) common-image.c common-image.h
     36img2txt_SOURCES = img2txt.c common-image.c common-image.h
    3737img2txt_LDADD = ../caca/libcaca.la
    3838img2txt_CFLAGS = $(IMLIB2_CFLAGS)
Note: See TracChangeset for help on using the changeset viewer.