[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
00-maintainer-mode.patch
From: |
Akim Demaille |
Subject: |
00-maintainer-mode.patch |
Date: |
Sun, 04 Mar 2001 22:12:43 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* automake.in (&file_contents): Map MAINTAINER-MODE to
@MAINTAINER_MODE_TRUE@ or nothing.
* configure.am, remake-hdr.am, remake.am, texi-vers.am: Adjust.
Suggested by Tom.
Index: automake.in
--- automake.in Fri, 02 Mar 2001 00:37:17 +0100 akim (am/f/39_automake.i 1.107
755)
+++ automake.in Sun, 04 Mar 2001 11:25:27 +0100 akim (am/f/39_automake.i 1.107
755)
@@ -6732,7 +6732,8 @@ sub file_contents
# prevents us from matching the end of line.
"s/##([^#\n].*)?\\n//gmo;"
. &transform ('CYGNUS' => $cygnus_mode,
- 'MAINTAINER-MODE' => $seen_maint_mode,
+ 'MAINTAINER-MODE'
+ => $seen_maint_mode ? '@MAINTAINER_MODE_TRUE@' : '',
'SHAR' => $options{'dist-shar'},
'BZIP2' => $options{'dist-bzip2'},
Index: configure.am
--- configure.am Thu, 01 Mar 2001 22:20:42 +0100 akim (am/h/32_configure. 1.1
644)
+++ configure.am Sun, 04 Mar 2001 11:21:19 +0100 akim (am/h/32_configure. 1.1
644)
@@ -18,14 +18,12 @@
## 02111-1307, USA.
## This rule remakes the Makefile.in.
-?MAINTAINER-MODE?%MAKEFILE-IN%: @MAINTAINER_MODE_TRUE@ %MAKEFILE-AM%
%MAKEFILE-IN-DEPS% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4)
-?!MAINTAINER-MODE?%MAKEFILE-IN%: %MAKEFILE-AM% %MAKEFILE-IN-DEPS%
$(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4)
+%MAKEFILE-IN%: %MAINTAINER-MODE% %MAKEFILE-AM% %MAKEFILE-IN-DEPS%
$(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --%STRICTNESS% %USE-DEPS% %MAKEFILE-AM-SOURCES%
## This rule remakes the Makefile.
-?MAINTAINER-MODE?%MAKEFILE%: @MAINTAINER_MODE_TRUE@ %MAKEFILE-IN%
%MAKEFILE-DEPS% $(top_builddir)/config.status
-?!MAINTAINER-MODE?%MAKEFILE%: %MAKEFILE-IN% %MAKEFILE-DEPS%
$(top_builddir)/config.status
+%MAKEFILE%: %MAINTAINER-MODE% %MAKEFILE-IN% %MAKEFILE-DEPS%
$(top_builddir)/config.status
cd $(top_builddir) && \
CONFIG_HEADERS= CONFIG_LINKS= \
CONFIG_FILES=%CONFIG-MAKEFILE% $(SHELL) ./config.status
Index: remake-hdr.am
--- remake-hdr.am Thu, 01 Mar 2001 22:20:42 +0100 akim (am/g/17_remake-hdr 1.4
644)
+++ remake-hdr.am Sun, 04 Mar 2001 11:22:31 +0100 akim (am/g/17_remake-hdr 1.4
644)
@@ -37,8 +37,7 @@
@mv %STAMP%T %STAMP%
## Explicitly look in srcdir for benefit of non-GNU makes.
## SRC_STAMP takes into account a possible subdir where CONFIG_HEADER_IN is
-?MAINTAINER-MODE?$(srcdir)/%CONFIG_HEADER_IN%:
@address@hidden(srcdir)/%SRC_STAMP%.in
-?!MAINTAINER-MODE?$(srcdir)/%CONFIG_HEADER_IN%: $(srcdir)/%SRC_STAMP%.in
+$(srcdir)/%CONFIG_HEADER_IN%: %MAINTAINER-MODE% $(srcdir)/%SRC_STAMP%.in
## Recover from removal of CONFIG_HEADER_IN
@if test ! -f $@; then \
rm -f $(srcdir)/%SRC_STAMP%.in; \
Index: remake.am
--- remake.am Thu, 01 Mar 2001 22:20:42 +0100 akim (am/g/16_remake.am 1.4 644)
+++ remake.am Sun, 04 Mar 2001 11:22:50 +0100 akim (am/g/16_remake.am 1.4 644)
@@ -20,6 +20,5 @@
config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
## Explicitly look in srcdir for benefit of non-GNU makes.
-?MAINTAINER-MODE?$(srcdir)/configure: @address@hidden(srcdir)/%CONFIGURE-AC%
$(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-?!MAINTAINER-MODE?$(srcdir)/configure: $(srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4)
$(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: %MAINTAINER-MODE% $(srcdir)/%CONFIGURE-AC% $(ACLOCAL_M4)
$(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
Index: texi-vers.am
--- texi-vers.am Thu, 01 Mar 2001 22:20:42 +0100 akim (am/g/11_texi-vers. 1.5
644)
+++ texi-vers.am Sun, 04 Mar 2001 11:23:32 +0100 akim (am/g/11_texi-vers. 1.5
644)
@@ -16,8 +16,7 @@
## along with this program; if not, write to the Free Software
## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
## 02111-1307, USA.
-?MAINTAINER-MODE?$(srcdir)/%VTEXI%: @address@hidden(srcdir)/stamp-%VTI%
-?!MAINTAINER-MODE?$(srcdir)/%VTEXI%: $(srcdir)/stamp-%VTI%
+$(srcdir)/%VTEXI%: %MAINTAINER-MODE% $(srcdir)/stamp-%VTI%
@:
## Depend on %CONFIGURE-AC% so that version number updates cause a
@@ -43,7 +42,6 @@
maintainer-clean-am: maintainer-clean-%VTI%
maintainer-clean-%VTI%:
address@hidden@ -rm -f $(srcdir)/stamp-%VTI% $(srcdir)/%VTEXI%
-?!MAINTAINER-MODE? -rm -f $(srcdir)/stamp-%VTI% $(srcdir)/%VTEXI%
+%MAINTAINER-MODE% -rm -f $(srcdir)/stamp-%VTI% $(srcdir)/%VTEXI%
.PHONY: mostlyclean-%VTI% maintainer-clean-%VTI%
- 00-maintainer-mode.patch,
Akim Demaille <=