aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog13
-rw-r--r--Makefile.in39
-rw-r--r--Makefile.tpl39
3 files changed, 57 insertions, 34 deletions
diff --git a/ChangeLog b/ChangeLog
index d74ddbb..15ce1e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-12-28 Alexandre Oliva <aoliva@redhat.com>
+
+ * Makefile.tpl ($(NOTPARALLEL)): Move to the end. Bring uses of
+ program_transform_name to standard idiom.
+ (AUTOGEN, AUTOCONF): Define.
+ (Makefile.in): Use $(AUTOGEN).
+ (Makefile): Depend on config.status, and use autoconf-style rule to
+ build it. Move original commands to...
+ (config.status): ... this new target.
+ (configure): Add $(srcdir). Depend on config/acx.m4. Use
+ $(AUTOCONF).
+ * Makefile.in: Rebuilt.
+
2002-12-28 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.tpl: Fix dramatic bustage due to change in
diff --git a/Makefile.in b/Makefile.in
index 1e8925c..e1fa0c0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,12 +20,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# Tell GNU make 3.79 not to run the top level in parallel. This
-# prevents contention for $builddir/$target/config.cache, as well
-# as minimizing scatter in file system caches.
-NOTPARALLEL = .NOTPARALLEL
-$(NOTPARALLEL):
-
VPATH=@srcdir@
links=@configlinks@
@@ -279,7 +273,7 @@ USUAL_AS_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(AS); \
else \
- t='$(program_transform_name)'; echo as | sed -e $$t ; \
+ echo as | sed '$(program_transform_name)' ; \
fi; \
fi`
@@ -293,7 +287,7 @@ USUAL_LD_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(LD); \
else \
- t='$(program_transform_name)'; echo ld | sed -e $$t ; \
+ echo ld | sed '$(program_transform_name)' ; \
fi; \
fi`
@@ -305,7 +299,7 @@ USUAL_DLLTOOL_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(DLLTOOL); \
else \
- t='$(program_transform_name)'; echo dlltool | sed -e $$t ; \
+ echo dlltool | sed '$(program_transform_name)' ; \
fi; \
fi`
@@ -317,7 +311,7 @@ USUAL_WINDRES_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(WINDRES); \
else \
- t='$(program_transform_name)'; echo windres | sed -e $$t ; \
+ echo windres | sed '$(program_transform_name)' ; \
fi; \
fi`
@@ -329,7 +323,7 @@ USUAL_AR_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(AR); \
else \
- t='$(program_transform_name)'; echo ar | sed -e $$t ; \
+ echo ar | sed '$(program_transform_name)' ; \
fi; \
fi`
@@ -345,7 +339,7 @@ USUAL_RANLIB_FOR_TARGET = ` \
echo ranlib; \
fi; \
else \
- t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \
+ echo ranlib | sed '$(program_transform_name)' ; \
fi; \
fi`
@@ -359,7 +353,7 @@ USUAL_NM_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(NM); \
else \
- t='$(program_transform_name)'; echo nm | sed -e $$t ; \
+ echo nm | sed '$(program_transform_name)' ; \
fi; \
fi`
@@ -7695,19 +7689,30 @@ multilib.ts: maybe-all-gcc
echo timestamp > multilib.ts
# Rebuilding Makefile.in, using autogen.
+AUTOGEN = autogen
$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
- cd $(srcdir) && autogen Makefile.def
+ cd $(srcdir) && $(AUTOGEN) Makefile.def
# Rebuilding Makefile.
-Makefile: Makefile.in configure $(gcc_version_trigger)
+Makefile: $(srcdir)/Makefile.in config.status
+ CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+config.status: configure $(gcc_version_trigger)
$(SHELL) ./config.status --recheck
# Rebuilding configure.
-configure: configure.in
- cd $(srcdir) && autoconf
+AUTOCONF = autoconf
+$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/config/acx.m4
+ cd $(srcdir) && $(AUTOCONF)
#
.NOEXPORT:
MAKEOVERRIDES=
+# Tell GNU make 3.79 not to run the top level in parallel. This
+# prevents contention for $builddir/$target/config.cache, as well
+# as minimizing scatter in file system caches.
+NOTPARALLEL = .NOTPARALLEL
+$(NOTPARALLEL):
+
# end of Makefile.in
diff --git a/Makefile.tpl b/Makefile.tpl
index 01549b7..ea5fd91 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -23,12 +23,6 @@ in
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# Tell GNU make 3.79 not to run the top level in parallel. This
-# prevents contention for $builddir/$target/config.cache, as well
-# as minimizing scatter in file system caches.
-NOTPARALLEL = .NOTPARALLEL
-$(NOTPARALLEL):
-
VPATH=@srcdir@
links=@configlinks@
@@ -282,7 +276,7 @@ USUAL_AS_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(AS); \
else \
- t='$(program_transform_name)'; echo as | sed -e $$t ; \
+ echo as | sed '$(program_transform_name)' ; \
fi; \
fi`
@@ -296,7 +290,7 @@ USUAL_LD_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(LD); \
else \
- t='$(program_transform_name)'; echo ld | sed -e $$t ; \
+ echo ld | sed '$(program_transform_name)' ; \
fi; \
fi`
@@ -308,7 +302,7 @@ USUAL_DLLTOOL_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(DLLTOOL); \
else \
- t='$(program_transform_name)'; echo dlltool | sed -e $$t ; \
+ echo dlltool | sed '$(program_transform_name)' ; \
fi; \
fi`
@@ -320,7 +314,7 @@ USUAL_WINDRES_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(WINDRES); \
else \
- t='$(program_transform_name)'; echo windres | sed -e $$t ; \
+ echo windres | sed '$(program_transform_name)' ; \
fi; \
fi`
@@ -332,7 +326,7 @@ USUAL_AR_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(AR); \
else \
- t='$(program_transform_name)'; echo ar | sed -e $$t ; \
+ echo ar | sed '$(program_transform_name)' ; \
fi; \
fi`
@@ -348,7 +342,7 @@ USUAL_RANLIB_FOR_TARGET = ` \
echo ranlib; \
fi; \
else \
- t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \
+ echo ranlib | sed '$(program_transform_name)' ; \
fi; \
fi`
@@ -362,7 +356,7 @@ USUAL_NM_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(NM); \
else \
- t='$(program_transform_name)'; echo nm | sed -e $$t ; \
+ echo nm | sed '$(program_transform_name)' ; \
fi; \
fi`
@@ -1414,19 +1408,30 @@ multilib.ts: maybe-all-gcc
echo timestamp > multilib.ts
# Rebuilding Makefile.in, using autogen.
+AUTOGEN = autogen
$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
- cd $(srcdir) && autogen Makefile.def
+ cd $(srcdir) && $(AUTOGEN) Makefile.def
# Rebuilding Makefile.
-Makefile: Makefile.in configure $(gcc_version_trigger)
+Makefile: $(srcdir)/Makefile.in config.status
+ CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+config.status: configure $(gcc_version_trigger)
$(SHELL) ./config.status --recheck
# Rebuilding configure.
-configure: configure.in
- cd $(srcdir) && autoconf
+AUTOCONF = autoconf
+$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/config/acx.m4
+ cd $(srcdir) && $(AUTOCONF)
#
.NOEXPORT:
MAKEOVERRIDES=
+# Tell GNU make 3.79 not to run the top level in parallel. This
+# prevents contention for $builddir/$target/config.cache, as well
+# as minimizing scatter in file system caches.
+NOTPARALLEL = .NOTPARALLEL
+$(NOTPARALLEL):
+
# end of Makefile.in
generated by cgit v1.1 at 2024-11-15 19:42:36 +0000