Changeset 4820

Timestamp:

06/17/12 14:36:15 (12 months ago)

Author:

sam

Message:

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

Location:

libcaca/trunk

Files:

• configure.ac (modified) (5 diffs)
• src/Makefile.am (modified) (1 diff)

libcaca/trunk/configure.ac

@@ -4 +4 @@
 AC_CONFIG_AUX_DIR(.auto)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([subdir-objects no-define tar-ustar silent-rules])
+dnl  We cannot use subdir-objects because of a bug that will eg. remove
+dnl  ../src/.deps upon distclean when a file from ../src/ is used.
+AM_INIT_AUTOMAKE([no-define tar-ustar silent-rules])
 dnl AM_MAINTAINER_MODE
 
@@ -36 +38 @@
 AC_TYPE_SIGNAL
 
-dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right
-dnl now otherwise it might be set in an obscure if statement. Same thing for
-dnl PKG_PROG_PKG_CONFIG which needs to be called first.
+dnl  AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right
+dnl  now otherwise it might be set in an obscure if statement. Same thing for
+dnl  PKG_PROG_PKG_CONFIG which needs to be called first.
 AC_EGREP_CPP(yes, foo)
 PKG_PROG_PKG_CONFIG()
@@ -55 +57 @@
 AC_SUBST(LT_SUFFIX)
 
-dnl global configuration features
+dnl  global configuration features
 AC_ARG_ENABLE(kernel,
   [  --enable-kernel         kernel mode (default no)])
 
-dnl output driver features
+dnl  output driver features
 AC_ARG_ENABLE(slang,
   [  --enable-slang          slang graphics support (autodetected)])
@@ -79 +81 @@
   [  --enable-vga            VGA support for kernel mode (autodetected)])
 
-dnl language bindings
+dnl  language bindings
 AC_ARG_ENABLE(csharp,
   [  --enable-csharp         C# bindings (autodetected)])
@@ -91 +93 @@
   [  --enable-ruby           Ruby bindings (autodetected)])
 
-dnl example programs features
+dnl  example programs features
 AC_ARG_ENABLE(imlib2,
   [  --enable-imlib2         Imlib2 graphics support (autodetected)])
 
-dnl conditional builds
+dnl  conditional builds
 AC_ARG_ENABLE(debug,
   [  --enable-debug          build debug versions of the library (default no)])

libcaca/trunk/src/Makefile.am

@@ -34 +34 @@
 
 
-img2txt_SOURCES = img2txt.c $(GETOPT) common-image.c common-image.h
+img2txt_SOURCES = img2txt.c common-image.c common-image.h
 img2txt_LDADD = ../caca/libcaca.la
 img2txt_CFLAGS = $(IMLIB2_CFLAGS)