4 жовтня 2006 о 16:19 +0200 Eugeniy Meshcheryakov написав(-ла): > Package: affix > Followup-For: Bug #358279 > > I uploaded NMU for this bug (prepared by Hendrik Sattler > <[EMAIL PROTECTED]>) to DELAYED/3-day queue. Patch for NMU is attached. I uploaded one more NMU, prepared by Hendrik Sattler, that fixes FTBFS on powerpc.
Changes: affix (2.1.2-3.3) unstable; urgency=low . * Add AM_MAINTAINER_MODE to force not using aclocal or auto* * run auto* and libtoolize before upload (closes: #356371) -- Eugeniy Meshcheryakov
diff -urpN 4/affix-2.1.2/aclocal.m4 affix-2.1.2/aclocal.m4
--- 4/affix-2.1.2/aclocal.m4 2006-10-09 10:52:24.000000000 +0200
+++ affix-2.1.2/aclocal.m4 2006-10-09 10:52:45.000000000 +0200
@@ -951,6 +951,39 @@ else
fi
AC_SUBST($1)])
+# Add --enable-maintainer-mode option to configure.
+# From Jim Meyering
+
+# serial 1
+
+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
+]
+)
+
+# Define a conditional.
+
+AC_DEFUN([AM_CONDITIONAL],
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+else
+ $1_TRUE='#'
+ $1_FALSE=
+fi])
+
# Like AC_CONFIG_HEADER, but automatically create stamp file.
AC_DEFUN([AM_CONFIG_HEADER],
@@ -7352,19 +7385,6 @@ AC_CHECK_PROGS(LEX, flex lex, $missing_d
AC_PROG_LEX
AC_DECL_YYTEXT])
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi])
-
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
#
# Copyright © 2004 Scott James Remnant <[EMAIL PROTECTED]>.
diff -urpN 4/affix-2.1.2/configure affix-2.1.2/configure
--- 4/affix-2.1.2/configure 2006-10-09 10:52:24.000000000 +0200
+++ affix-2.1.2/configure 2006-10-09 10:52:45.000000000 +0200
@@ -802,6 +802,9 @@ AUTOMAKE
AUTOHEADER
MAKEINFO
SET_MAKE
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
CC
CFLAGS
LDFLAGS
@@ -1467,6 +1470,8 @@ if test -n "$ac_init_help"; then
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
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes]
--enable-fast-install[=PKGS]
@@ -2242,6 +2247,29 @@ echo "${ECHO_T}missing" >&6; }
fi
+{ 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 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
+
+
#AC_CONFIG_HEADERS(include/config.h)
ac_config_headers="$ac_config_headers include/config.h"
@@ -4052,7 +4080,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4055 "configure"' > conftest.$ac_ext
+ echo '#line 4083 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6907,11 +6935,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6910: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6938: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6914: \$? = $ac_status" >&5
+ echo "$as_me:6942: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7175,11 +7203,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7178: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7206: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7182: \$? = $ac_status" >&5
+ echo "$as_me:7210: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7279,11 +7307,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7282: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7310: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7286: \$? = $ac_status" >&5
+ echo "$as_me:7314: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9720,7 +9748,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9723 "configure"
+#line 9751 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9820,7 +9848,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9823 "configure"
+#line 9851 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12188,11 +12216,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12191: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12219: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12195: \$? = $ac_status" >&5
+ echo "$as_me:12223: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12292,11 +12320,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12295: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12323: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12299: \$? = $ac_status" >&5
+ echo "$as_me:12327: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13853,11 +13881,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13856: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13884: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13860: \$? = $ac_status" >&5
+ echo "$as_me:13888: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13957,11 +13985,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13960: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13988: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13964: \$? = $ac_status" >&5
+ echo "$as_me:13992: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16176,11 +16204,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16179: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16207: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16183: \$? = $ac_status" >&5
+ echo "$as_me:16211: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16444,11 +16472,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16447: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16475: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16451: \$? = $ac_status" >&5
+ echo "$as_me:16479: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16548,11 +16576,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16551: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16579: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16555: \$? = $ac_status" >&5
+ echo "$as_me:16583: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21026,6 +21054,9 @@ AUTOMAKE!$AUTOMAKE$ac_delim
AUTOHEADER!$AUTOHEADER$ac_delim
MAKEINFO!$MAKEINFO$ac_delim
SET_MAKE!$SET_MAKE$ac_delim
+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+MAINT!$MAINT$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
@@ -21072,9 +21103,6 @@ CONFIG_AFFIX_UART_TRUE!$CONFIG_AFFIX_UAR
CONFIG_AFFIX_UART_FALSE!$CONFIG_AFFIX_UART_FALSE$ac_delim
CONFIG_AFFIX_SDP_TRUE!$CONFIG_AFFIX_SDP_TRUE$ac_delim
CONFIG_AFFIX_SDP_FALSE!$CONFIG_AFFIX_SDP_FALSE$ac_delim
-PKG_CONFIG!$PKG_CONFIG$ac_delim
-OPENOBEX_CFLAGS!$OPENOBEX_CFLAGS$ac_delim
-OPENOBEX_LIBS!$OPENOBEX_LIBS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -21116,6 +21144,9 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+OPENOBEX_CFLAGS!$OPENOBEX_CFLAGS$ac_delim
+OPENOBEX_LIBS!$OPENOBEX_LIBS$ac_delim
CONFIG_AFFIX_OBEX_TRUE!$CONFIG_AFFIX_OBEX_TRUE$ac_delim
CONFIG_AFFIX_OBEX_FALSE!$CONFIG_AFFIX_OBEX_FALSE$ac_delim
CONFIG_AFFIX_DEBUG_TRUE!$CONFIG_AFFIX_DEBUG_TRUE$ac_delim
@@ -21135,7 +21166,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urpN 4/affix-2.1.2/configure.ac affix-2.1.2/configure.ac
--- 4/affix-2.1.2/configure.ac 2006-10-09 10:52:24.000000000 +0200
+++ affix-2.1.2/configure.ac 2006-10-09 10:52:45.000000000 +0200
@@ -6,6 +6,7 @@
AC_INIT(Affix, 2.1.2, [EMAIL PROTECTED], affix)
AM_INIT_AUTOMAKE(affix, 2.1.2)
+AM_MAINTAINER_MODE
#AC_CONFIG_HEADERS(include/config.h)
AM_CONFIG_HEADER(include/config.h)
#prefix
diff -urpN 4/affix-2.1.2/control/Makefile.in affix-2.1.2/control/Makefile.in
--- 4/affix-2.1.2/control/Makefile.in 2006-10-09 10:52:24.000000000 +0200
+++ affix-2.1.2/control/Makefile.in 2006-10-09 10:52:45.000000000 +0200
@@ -92,6 +92,7 @@ LIB = @LIB@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIB = @LTLIB@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
@@ -199,7 +200,7 @@ OBJECTS = $(btctl_OBJECTS)
all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .obj .s
-$(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 control/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
diff -urpN 4/affix-2.1.2/daemon/Makefile.in affix-2.1.2/daemon/Makefile.in
--- 4/affix-2.1.2/daemon/Makefile.in 2006-10-09 10:52:24.000000000 +0200
+++ affix-2.1.2/daemon/Makefile.in 2006-10-09 10:52:45.000000000 +0200
@@ -90,6 +90,7 @@ LIB = @LIB@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIB = @LTLIB@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
@@ -153,7 +154,7 @@ OBJECTS = $(btsrv_OBJECTS)
all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .l .lo .o .obj .s .y
-$(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 daemon/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
diff -urpN 4/affix-2.1.2/debian/changelog affix-2.1.2/debian/changelog
--- 4/affix-2.1.2/debian/changelog 2006-10-09 10:52:24.000000000 +0200
+++ affix-2.1.2/debian/changelog 2006-10-09 10:52:45.000000000 +0200
@@ -1,3 +1,10 @@
+affix (2.1.2-3.3) unstable; urgency=low
+
+ * Add AM_MAINTAINER_MODE to force not using aclocal or auto*
+ * run auto* and libtoolize before upload (closes: #356371)
+
+ -- Hendrik Sattler <[EMAIL PROTECTED]> Sun, 8 Oct 2006 12:43:28 +0200
+
affix (2.1.2-3.2) unstable; urgency=low
* NMU
diff -urpN 4/affix-2.1.2/debian/rules affix-2.1.2/debian/rules
--- 4/affix-2.1.2/debian/rules 2006-10-09 10:52:24.000000000 +0200
+++ affix-2.1.2/debian/rules 2006-10-09 10:52:45.000000000 +0200
@@ -26,8 +26,8 @@ build-stamp:
clean:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp include/affix
-$(MAKE) distclean
+ rm -f build-stamp configure-stamp include/affix
dh_clean
install: build
diff -urpN 4/affix-2.1.2/etc/Makefile.in affix-2.1.2/etc/Makefile.in
--- 4/affix-2.1.2/etc/Makefile.in 2006-10-09 10:52:24.000000000 +0200
+++ affix-2.1.2/etc/Makefile.in 2006-10-09 10:52:45.000000000 +0200
@@ -90,6 +90,7 @@ LIB = @LIB@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIB = @LTLIB@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
@@ -131,7 +132,7 @@ TAR = tar
GZIP_ENV = --best
all: all-redirect
.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 etc/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
diff -urpN 4/affix-2.1.2/include/Makefile.in affix-2.1.2/include/Makefile.in
--- 4/affix-2.1.2/include/Makefile.in 2006-10-09 10:52:24.000000000 +0200
+++ affix-2.1.2/include/Makefile.in 2006-10-09 10:52:45.000000000 +0200
@@ -92,6 +92,7 @@ LIB = @LIB@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIB = @LTLIB@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
@@ -124,7 +125,7 @@ TAR = tar
GZIP_ENV = --best
all: all-redirect
.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 include/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
@@ -142,7 +143,7 @@ stamp-h: $(srcdir)/config.h.in $(top_bui
&& CONFIG_FILES= CONFIG_HEADERS=include/config.h \
$(SHELL) ./config.status
@echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+$(srcdir)/config.h.in: @[EMAIL PROTECTED](srcdir)/stamp-h.in
@if test ! -f $@; then \
rm -f $(srcdir)/stamp-h.in; \
$(MAKE) $(srcdir)/stamp-h.in; \
diff -urpN 4/affix-2.1.2/lib/Makefile.in affix-2.1.2/lib/Makefile.in
--- 4/affix-2.1.2/lib/Makefile.in 2006-10-09 10:52:24.000000000 +0200
+++ affix-2.1.2/lib/Makefile.in 2006-10-09 10:52:45.000000000 +0200
@@ -90,6 +90,7 @@ LIB = @LIB@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIB = @LTLIB@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
@@ -140,7 +141,7 @@ OBJECTS = $(libaffix_la_OBJECTS)
all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .obj .s
-$(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 lib/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
diff -urpN 4/affix-2.1.2/Makefile.in affix-2.1.2/Makefile.in
--- 4/affix-2.1.2/Makefile.in 2006-10-09 10:52:24.000000000 +0200
+++ affix-2.1.2/Makefile.in 2006-10-09 10:52:45.000000000 +0200
@@ -90,6 +90,7 @@ LIB = @LIB@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIB = @LTLIB@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
@@ -114,7 +115,8 @@ CONFIG_HEADER = ./include/config.h
CONFIG_CLEAN_FILES =
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
Makefile.in NEWS TODO aclocal.m4 config.guess config.sub configure \
-configure.ac install-sh ltmain.sh missing mkinstalldirs
+configure.ac include/config.h.in include/stamp-h.in install-sh \
+ltmain.sh missing mkinstalldirs
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -123,21 +125,49 @@ TAR = tar
GZIP_ENV = --best
all: all-redirect
.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 Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-$(ACLOCAL_M4): configure.ac
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac
cd $(srcdir) && $(ACLOCAL)
config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4)
$(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: @[EMAIL PROTECTED](srcdir)/configure.ac $(ACLOCAL_M4)
$(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
+include/config.h: include/stamp-h
+ @if test ! -f $@; then \
+ rm -f include/stamp-h; \
+ $(MAKE) include/stamp-h; \
+ else :; fi
+include/stamp-h: $(srcdir)/include/config.h.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES= CONFIG_HEADERS=include/config.h \
+ $(SHELL) ./config.status
+ @echo timestamp > include/stamp-h 2> /dev/null
+$(srcdir)/include/config.h.in: @[EMAIL PROTECTED](srcdir)/include/stamp-h.in
+ @if test ! -f $@; then \
+ rm -f $(srcdir)/include/stamp-h.in; \
+ $(MAKE) $(srcdir)/include/stamp-h.in; \
+ else :; fi
+$(srcdir)/include/stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ @echo timestamp > $(srcdir)/include/stamp-h.in 2> /dev/null
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+ -rm -f include/config.h
+
+maintainer-clean-hdr:
+
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
@@ -326,33 +356,33 @@ distclean-generic:
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
-mostlyclean-am: mostlyclean-tags mostlyclean-generic
+mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
mostlyclean: mostlyclean-recursive
-clean-am: clean-tags clean-generic mostlyclean-am
+clean-am: clean-hdr clean-tags clean-generic mostlyclean-am
clean: clean-recursive
-distclean-am: distclean-tags distclean-generic clean-am
+distclean-am: distclean-hdr distclean-tags distclean-generic clean-am
-rm -f libtool
distclean: distclean-recursive
-rm -f config.status
-maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
- distclean-am
+maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \
+ maintainer-clean-generic distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-recursive
-rm -f config.status
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+install-data-recursive uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
dvi-am dvi check check-am installcheck-am installcheck \
diff -urpN 4/affix-2.1.2/obex/Makefile.in affix-2.1.2/obex/Makefile.in
--- 4/affix-2.1.2/obex/Makefile.in 2006-10-09 10:52:24.000000000 +0200
+++ affix-2.1.2/obex/Makefile.in 2006-10-09 10:52:45.000000000 +0200
@@ -90,6 +90,7 @@ LIB = @LIB@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIB = @LTLIB@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
@@ -157,7 +158,7 @@ OBJECTS = $(libaffix_obex_la_OBJECTS) $(
all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .obj .s
-$(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 obex/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
diff -urpN 4/affix-2.1.2/sdp/Makefile.in affix-2.1.2/sdp/Makefile.in
--- 4/affix-2.1.2/sdp/Makefile.in 2006-10-09 10:52:24.000000000 +0200
+++ affix-2.1.2/sdp/Makefile.in 2006-10-09 10:52:45.000000000 +0200
@@ -90,6 +90,7 @@ LIB = @LIB@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIB = @LTLIB@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
@@ -163,7 +164,7 @@ OBJECTS = $(libaffix_sdp_la_OBJECTS) $(l
all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .obj .s
-$(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 sdp/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
diff -urpN 4/affix-2.1.2/tools/Makefile.in affix-2.1.2/tools/Makefile.in
--- 4/affix-2.1.2/tools/Makefile.in 2006-10-09 10:52:24.000000000 +0200
+++ affix-2.1.2/tools/Makefile.in 2006-10-09 10:52:45.000000000 +0200
@@ -90,6 +90,7 @@ LIB = @LIB@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIB = @LTLIB@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
@@ -144,7 +145,7 @@ OBJECTS = $(btmodem_OBJECTS)
all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .obj .s
-$(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 tools/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
signature.asc
Description: Digital signature
