JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Makefile.tpl ($(NOTPARALLEL)): Move to the end. Bring uses of

Browse Source 
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.
This commit is contained in:
Alexandre Oliva
2002-12-28 16:25:00 +00:00
parent dd1522e4cd
commit 81011f17bb
3 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@@ -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> 2002-12-28 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.tpl: Fix dramatic bustage due to change in * Makefile.tpl: Fix dramatic bustage due to change in

39
Makefile.in
View File

@@ -20,12 +20,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # 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@ VPATH=@srcdir@
links=@configlinks@ links=@configlinks@
@@ -279,7 +273,7 @@ USUAL_AS_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(AS); \ echo $(AS); \
else \ else \
t='$(program_transform_name)'; echo as | sed -e $$t ; \ echo as | sed '$(program_transform_name)' ; \
fi; \ fi; \
fi` fi`
@@ -293,7 +287,7 @@ USUAL_LD_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(LD); \ echo $(LD); \
else \ else \
t='$(program_transform_name)'; echo ld | sed -e $$t ; \ echo ld | sed '$(program_transform_name)' ; \
fi; \ fi; \
fi` fi`
@@ -305,7 +299,7 @@ USUAL_DLLTOOL_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(DLLTOOL); \ echo $(DLLTOOL); \
else \ else \
t='$(program_transform_name)'; echo dlltool | sed -e $$t ; \ echo dlltool | sed '$(program_transform_name)' ; \
fi; \ fi; \
fi` fi`
@@ -317,7 +311,7 @@ USUAL_WINDRES_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(WINDRES); \ echo $(WINDRES); \
else \ else \
t='$(program_transform_name)'; echo windres | sed -e $$t ; \ echo windres | sed '$(program_transform_name)' ; \
fi; \ fi; \
fi` fi`
@@ -329,7 +323,7 @@ USUAL_AR_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(AR); \ echo $(AR); \
else \ else \
t='$(program_transform_name)'; echo ar | sed -e $$t ; \ echo ar | sed '$(program_transform_name)' ; \
fi; \ fi; \
fi` fi`
@@ -345,7 +339,7 @@ USUAL_RANLIB_FOR_TARGET = ` \
echo ranlib; \ echo ranlib; \
fi; \ fi; \
else \ else \
t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \ echo ranlib | sed '$(program_transform_name)' ; \
fi; \ fi; \
fi` fi`
@@ -359,7 +353,7 @@ USUAL_NM_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(NM); \ echo $(NM); \
else \ else \
t='$(program_transform_name)'; echo nm | sed -e $$t ; \ echo nm | sed '$(program_transform_name)' ; \
fi; \ fi; \
fi` fi`
@@ -7695,19 +7689,30 @@ multilib.ts: maybe-all-gcc
echo timestamp > multilib.ts echo timestamp > multilib.ts
# Rebuilding Makefile.in, using autogen. # Rebuilding Makefile.in, using autogen.
AUTOGEN = autogen
$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def $(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
cd $(srcdir) && autogen Makefile.def cd $(srcdir) && $(AUTOGEN) Makefile.def
# Rebuilding Makefile. # 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 $(SHELL) ./config.status --recheck
# Rebuilding configure. # Rebuilding configure.
configure: configure.in AUTOCONF = autoconf
cd $(srcdir) && autoconf $(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/config/acx.m4
cd $(srcdir) && $(AUTOCONF)
# #
.NOEXPORT: .NOEXPORT:
MAKEOVERRIDES= 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 # end of Makefile.in

39
Makefile.tpl
View File

@@ -23,12 +23,6 @@ in
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # 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@ VPATH=@srcdir@
links=@configlinks@ links=@configlinks@
@@ -282,7 +276,7 @@ USUAL_AS_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(AS); \ echo $(AS); \
else \ else \
t='$(program_transform_name)'; echo as | sed -e $$t ; \ echo as | sed '$(program_transform_name)' ; \
fi; \ fi; \
fi` fi`
@@ -296,7 +290,7 @@ USUAL_LD_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(LD); \ echo $(LD); \
else \ else \
t='$(program_transform_name)'; echo ld | sed -e $$t ; \ echo ld | sed '$(program_transform_name)' ; \
fi; \ fi; \
fi` fi`
@@ -308,7 +302,7 @@ USUAL_DLLTOOL_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(DLLTOOL); \ echo $(DLLTOOL); \
else \ else \
t='$(program_transform_name)'; echo dlltool | sed -e $$t ; \ echo dlltool | sed '$(program_transform_name)' ; \
fi; \ fi; \
fi` fi`
@@ -320,7 +314,7 @@ USUAL_WINDRES_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(WINDRES); \ echo $(WINDRES); \
else \ else \
t='$(program_transform_name)'; echo windres | sed -e $$t ; \ echo windres | sed '$(program_transform_name)' ; \
fi; \ fi; \
fi` fi`
@@ -332,7 +326,7 @@ USUAL_AR_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(AR); \ echo $(AR); \
else \ else \
t='$(program_transform_name)'; echo ar | sed -e $$t ; \ echo ar | sed '$(program_transform_name)' ; \
fi; \ fi; \
fi` fi`
@@ -348,7 +342,7 @@ USUAL_RANLIB_FOR_TARGET = ` \
echo ranlib; \ echo ranlib; \
fi; \ fi; \
else \ else \
t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \ echo ranlib | sed '$(program_transform_name)' ; \
fi; \ fi; \
fi` fi`
@@ -362,7 +356,7 @@ USUAL_NM_FOR_TARGET = ` \
if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \ if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
echo $(NM); \ echo $(NM); \
else \ else \
t='$(program_transform_name)'; echo nm | sed -e $$t ; \ echo nm | sed '$(program_transform_name)' ; \
fi; \ fi; \
fi` fi`
@@ -1414,19 +1408,30 @@ multilib.ts: maybe-all-gcc
echo timestamp > multilib.ts echo timestamp > multilib.ts
# Rebuilding Makefile.in, using autogen. # Rebuilding Makefile.in, using autogen.
AUTOGEN = autogen
$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def $(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
cd $(srcdir) && autogen Makefile.def cd $(srcdir) && $(AUTOGEN) Makefile.def
# Rebuilding Makefile. # 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 $(SHELL) ./config.status --recheck
# Rebuilding configure. # Rebuilding configure.
configure: configure.in AUTOCONF = autoconf
cd $(srcdir) && autoconf $(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/config/acx.m4
cd $(srcdir) && $(AUTOCONF)
# #
.NOEXPORT: .NOEXPORT:
MAKEOVERRIDES= 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 # end of Makefile.in