I've made an NMU upload to the gluck 3 day delay queue. This upload can be overriden by a maintainer upload between now and then.
The interdiff of the NMU is attached. Don Armstrong -- Frankly, if ignoring inane opinions and noisy people and not flaming them to crisp is bad behaviour, I have not yet achieved a state of nirvana. -- Manoj Srivastava in [EMAIL PROTECTED] http://www.donarmstrong.com http://rzlab.ucr.edu
diff -u libcaca-0.9/debian/changelog libcaca-0.9/debian/changelog
--- libcaca-0.9/debian/changelog
+++ libcaca-0.9/debian/changelog
@@ -1,3 +1,17 @@
+libcaca (0.9-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Hard-code cacaview_LDFLAGS = -lImlib2 instead of using the output of
+ imlib2-config which is incorrect for GNU/* systems using dynamic
+ linking. (Closes: #349790)
+ * Add AM_MAINTAINER_MODE to configure.ac as well, to avoid build-time
+ regeneration of autotools files.
+ * Fix syntax errors in doc/Makefile.am that aren't accepted by current
+ automake-1.7
+ * Thanks to Steve Langasek for the above patches
+
+ -- Don Armstrong <[EMAIL PROTECTED]> Sun, 19 Feb 2006 01:46:44 -0800
+
libcaca (0.9-5) unstable; urgency=low
* debian/control:
diff -u libcaca-0.9/doc/Makefile.in libcaca-0.9/doc/Makefile.in
--- libcaca-0.9/doc/Makefile.in
+++ libcaca-0.9/doc/Makefile.in
@@ -76,6 +76,9 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MATH_LIBS = @MATH_LIBS@
NEED_PIC_FALSE = @NEED_PIC_FALSE@
@@ -160,10 +163,10 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am
$(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu doc/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in
$(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)
doxygen.cfg: $(top_builddir)/config.status doxygen.cfg.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -405,7 +408,9 @@
@BUILD_DOCUMENTATION_TRUE@ cp `find html -name '*.html' -o -name '*.gif'
-o -name '*.png'` \
@BUILD_DOCUMENTATION_TRUE@ $(DESTDIR)$(datadir)/doc/libcaca-dev/html
@BUILD_DOCUMENTATION_TRUE@ $(mkinstalldirs) $(DESTDIR)$(mandir)/man3
[EMAIL PROTECTED]@ for mp in `find man -name '*.3caca'`; do sed
's/man3caca/man3/g' $$mp > $(DESTDIR)$(mandir)/man3/`basename $$mp`; done
[EMAIL PROTECTED]@ for mp in `find man -name '*.3caca'`; do \
[EMAIL PROTECTED]@ sed 's/man3caca/man3/g' $$mp >
$(DESTDIR)$(mandir)/man3/`basename $$mp`; \
[EMAIL PROTECTED]@ done
@BUILD_DOCUMENTATION_TRUE@ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1
@BUILD_DOCUMENTATION_TRUE@ rm -f $(DESTDIR)$(mandir)/man1/cacaball.1
@BUILD_DOCUMENTATION_TRUE@ ln -s cacademo.1
$(DESTDIR)$(mandir)/man1/cacaball.1
diff -u libcaca-0.9/doc/Makefile.am libcaca-0.9/doc/Makefile.am
--- libcaca-0.9/doc/Makefile.am
+++ libcaca-0.9/doc/Makefile.am
@@ -45,10 +45,9 @@
cp `find html -name '*.html' -o -name '*.gif' -o -name '*.png'` \
$(DESTDIR)$(datadir)/doc/libcaca-dev/html
$(mkinstalldirs) $(DESTDIR)$(mandir)/man3
- for mp in `find man -name '*.3caca'`; do
- sed 's/man3caca/man3/g' $$mp > $(DESTDIR)$(mandir)/man3/`basename
$$mp`;
+ for mp in `find man -name '*.3caca'`; do \
+ sed 's/man3caca/man3/g' $$mp > $(DESTDIR)$(mandir)/man3/`basename
$$mp`; \
done
- #cp `find man -name '*.3caca'` $(DESTDIR)$(mandir)/man3
$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
rm -f $(DESTDIR)$(mandir)/man1/cacaball.1
ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacaball.1
only in patch2:
unchanged:
--- libcaca-0.9.orig/src/Makefile.in
+++ libcaca-0.9/src/Makefile.in
@@ -76,6 +76,9 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MATH_LIBS = @MATH_LIBS@
NEED_PIC_FALSE = @NEED_PIC_FALSE@
@@ -220,10 +223,10 @@
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am
$(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu src/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in
$(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)
AR = ar
only in patch2:
unchanged:
--- libcaca-0.9.orig/examples/Makefile.in
+++ libcaca-0.9/examples/Makefile.in
@@ -76,6 +76,9 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MATH_LIBS = @MATH_LIBS@
NEED_PIC_FALSE = @NEED_PIC_FALSE@
@@ -168,7 +171,7 @@
cacaview_CPPFLAGS = -I$(top_srcdir)/src -DX_DISPLAY_MISSING=1
@[EMAIL PROTECTED] = `imlib2-config --cflags`
@[EMAIL PROTECTED] =
[EMAIL PROTECTED]@cacaview_LDFLAGS = `imlib2-config --libs`
[EMAIL PROTECTED]@cacaview_LDFLAGS = -lImlib2
@[EMAIL PROTECTED] =
subdir = examples
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -228,10 +231,10 @@
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am
$(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu examples/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in
$(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
only in patch2:
unchanged:
--- libcaca-0.9.orig/examples/Makefile.am
+++ libcaca-0.9/examples/Makefile.am
@@ -31,7 +31,7 @@
cacaview_CPPFLAGS = -I$(top_srcdir)/src -DX_DISPLAY_MISSING=1
if USE_IMLIB2
cacaview_CFLAGS = `imlib2-config --cflags`
-cacaview_LDFLAGS = `imlib2-config --libs`
+cacaview_LDFLAGS = -lImlib2
else
cacaview_CFLAGS =
cacaview_LDFLAGS =
only in patch2:
unchanged:
--- libcaca-0.9.orig/test/Makefile.in
+++ libcaca-0.9/test/Makefile.in
@@ -76,6 +76,9 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MATH_LIBS = @MATH_LIBS@
NEED_PIC_FALSE = @NEED_PIC_FALSE@
@@ -217,10 +220,10 @@
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am
$(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu test/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in
$(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)
clean-noinstPROGRAMS:
only in patch2:
unchanged:
--- libcaca-0.9.orig/aclocal.m4
+++ libcaca-0.9/aclocal.m4
@@ -859,6 +859,45 @@
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+# Add --enable-maintainer-mode option to configure.
+# From Jim Meyering
+
+# Copyright 1996, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode is disabled by default
+ AC_ARG_ENABLE(maintainer-mode,
+[ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer],
+ USE_MAINTAINER_MODE=$enableval,
+ USE_MAINTAINER_MODE=no)
+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+ MAINT=$MAINTAINER_MODE_TRUE
+ AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
# serial 2
# AM_PROG_CC_C_O
only in patch2:
unchanged:
--- libcaca-0.9.orig/configure
+++ libcaca-0.9/configure
@@ -309,7 +309,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os target
target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA
CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR
install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot
CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote
AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE
am__fastdepCC_FALSE CPP RANLIB ac_ct_RANLIB EGREP MATH_LIBS CACA_LIBS
NEED_PIC_TRUE NEED_PIC_FALSE IMLIB2_CONFIG USE_IMLIB2_TRUE USE_IMLIB2_FALSE
DOXYGEN LATEX DVIPS BUILD_DOCUMENTATION_TRUE BUILD_DOCUMENTATION_FALSE
USE_LATEX_TRUE USE_LATEX_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os target
target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA
CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR
install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot
MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS
ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE
AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP RANLIB
ac_ct_RANLIB EGREP MATH_LIBS CACA_LIBS NEED_PIC_TRUE NEED_PIC_FALSE
IMLIB2_CONFIG USE_IMLIB2_TRUE USE_IMLIB2_FALSE DOXYGEN LATEX DVIPS
BUILD_DOCUMENTATION_TRUE BUILD_DOCUMENTATION_FALSE USE_LATEX_TRUE
USE_LATEX_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -854,6 +854,8 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer
--disable-dependency-tracking Speeds up one-time builds
--enable-dependency-tracking Do not reject slow dependency extractors
--enable-slang slang graphics support (autodetected)
@@ -1805,6 +1807,31 @@
ac_config_headers="$ac_config_headers config.h"
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions
of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of
Makefiles... $ECHO_C" >&6
+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was
given.
+if test "${enable_maintainer_mode+set}" = set; then
+ enableval="$enable_maintainer_mode"
+ USE_MAINTAINER_MODE=$enableval
+else
+ USE_MAINTAINER_MODE=no
+fi;
+ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
+
+
+if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
+else
+ MAINTAINER_MODE_TRUE='#'
+ MAINTAINER_MODE_FALSE=
+fi
+
+ MAINT=$MAINTAINER_MODE_TRUE
+
+
+
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -4968,6 +4995,7 @@
echo "$as_me:$LINENO: checking for X" >&5
echo $ECHO_N "checking for X... $ECHO_C" >&6
+ac_path_x_has_been_run=yes
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
@@ -5060,7 +5088,7 @@
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Intrinsic.h.
+ # Guess where to find include files, by looking for a specified header file.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -5068,7 +5096,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -5095,7 +5123,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
+ if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -5109,18 +5137,18 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lXt $LIBS"
+ LIBS="-lX11 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XrmInitialize ()
;
return 0;
}
@@ -5158,7 +5186,7 @@
do
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
- if test -r $ac_dir/libXt.$ac_extension; then
+ if test -r $ac_dir/libX11.$ac_extension; then
ac_x_libraries=$ac_dir
break 2
fi
@@ -5194,8 +5222,12 @@
# Update the cache value to reflect the command line values.
ac_cv_have_x="have_x=yes \
ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes"
>&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ # It might be that x_includes is empty (headers are found in the
+ # standard search path. Then output the corresponding message
+ ac_out_x_includes=$x_includes
+ test "x$x_includes" = x && ac_out_x_includes="in standard search path"
+ echo "$as_me:$LINENO: result: libraries $x_libraries, headers
$ac_out_x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
fi
echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
@@ -6181,6 +6213,13 @@
LTLIBOBJS=$ac_ltlibobjs
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}";
then
+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never
defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -6795,6 +6834,9 @@
s,@AWK@,$AWK,;t t
s,@SET_MAKE@,$SET_MAKE,;t t
s,@am__leading_dot@,$am__leading_dot,;t t
+s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
+s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
+s,@MAINT@,$MAINT,;t t
s,@CC@,$CC,;t t
s,@CFLAGS@,$CFLAGS,;t t
s,@LDFLAGS@,$LDFLAGS,;t t
only in patch2:
unchanged:
--- libcaca-0.9.orig/autotools/Makefile.in
+++ libcaca-0.9/autotools/Makefile.in
@@ -74,6 +74,9 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MATH_LIBS = @MATH_LIBS@
NEED_PIC_FALSE = @NEED_PIC_FALSE@
@@ -145,10 +148,10 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am
$(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu autotools/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in
$(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)
uninstall-info-am:
tags: TAGS
only in patch2:
unchanged:
--- libcaca-0.9.orig/msvc/Makefile.in
+++ libcaca-0.9/msvc/Makefile.in
@@ -76,6 +76,9 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MATH_LIBS = @MATH_LIBS@
NEED_PIC_FALSE = @NEED_PIC_FALSE@
@@ -161,10 +164,10 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am
$(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu msvc/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in
$(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)
uninstall-info-am:
tags: TAGS
only in patch2:
unchanged:
--- libcaca-0.9.orig/debian/Makefile.in
+++ libcaca-0.9/debian/Makefile.in
@@ -76,6 +76,9 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MATH_LIBS = @MATH_LIBS@
NEED_PIC_FALSE = @NEED_PIC_FALSE@
@@ -148,10 +151,10 @@
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am
$(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu debian/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in
$(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)
uninstall-info-am:
tags: TAGS
only in patch2:
unchanged:
--- libcaca-0.9.orig/Makefile.in
+++ libcaca-0.9/Makefile.in
@@ -76,6 +76,9 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MATH_LIBS = @MATH_LIBS@
NEED_PIC_FALSE = @NEED_PIC_FALSE@
@@ -173,18 +176,18 @@
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am
$(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in
$(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
$(top_builddir)/config.status: $(srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4)
$(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac
$(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): configure.ac
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
@@ -197,7 +200,7 @@
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac
$(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOHEADER)
touch $(srcdir)/config.h.in
only in patch2:
unchanged:
--- libcaca-0.9.orig/configure.ac
+++ libcaca-0.9/configure.ac
@@ -9,6 +9,8 @@
AM_INIT_AUTOMAKE(libcaca, 0.9)
AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
+
AM_PROG_CC_C_O
AC_PROG_CPP
AC_PROG_RANLIB
signature.asc
Description: Digital signature
