diff options
| -rw-r--r-- | binutils/ChangeLog | 9 | ||||
| -rw-r--r-- | binutils/Makefile.am | 12 | ||||
| -rw-r--r-- | binutils/Makefile.in | 12 | ||||
| -rw-r--r-- | opcodes/ChangeLog | 8 | ||||
| -rw-r--r-- | opcodes/Makefile.am | 5 | ||||
| -rw-r--r-- | opcodes/Makefile.in | 6 |
6 files changed, 36 insertions, 16 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 987d47f..c574745 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,12 @@ +2009-08-28 H.J. Lu <hongjiu.lu@intel.com> + + * Makefile.am (sysinfo$(EXEEXT_FOR_BUILD)): Replace + CFLAGS/LDFLAGS with CFLAGS_FOR_BUILD/LDFLAGS_FOR_BUILD. + (syslex.o): Likewise. + (sysinfo.o): Likewise. + (bin2c$(EXEEXT_FOR_BUILD)): Likewise. + * Makefile.in: Regenerated. + 2009-08-27 Dave Korn <dave.korn.cygwin@gmail.com> * doc/binutils.texi (--only-keep-debug): Relocate stray para here ... diff --git a/binutils/Makefile.am b/binutils/Makefile.am index d0a367c..dbb0783 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -251,24 +251,24 @@ sysroff.h: sysinfo$(EXEEXT_FOR_BUILD) sysroff.info ./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o - $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) -o $@ sysinfo.o syslex.o + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.o syslex.o syslex.o: syslex.c sysinfo.h config.h if [ -r syslex.c ]; then \ - $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS) syslex.c -Wno-error ; \ + $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c -Wno-error ; \ else \ - $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS) $(srcdir)/syslex.c -Wno-error ;\ + $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c -Wno-error ;\ fi sysinfo.o: sysinfo.c if [ -r sysinfo.c ]; then \ - $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS) sysinfo.c -Wno-error ; \ + $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c -Wno-error ; \ else \ - $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS) $(srcdir)/sysinfo.c -Wno-error ; \ + $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c -Wno-error ; \ fi bin2c$(EXEEXT_FOR_BUILD): - $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(srcdir)/bin2c.c $(srcdir)/version.c + $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c $(srcdir)/version.c embedspu: embedspu.sh sed "s@^program_transform_name=@program_transform_name=$(program_transform_name)@" < $< > $@ diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 5d3b28c..e83cb6d 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -1193,24 +1193,24 @@ sysroff.h: sysinfo$(EXEEXT_FOR_BUILD) sysroff.info ./sysinfo$(EXEEXT_FOR_BUILD) -d <$(srcdir)/sysroff.info >sysroff.h sysinfo$(EXEEXT_FOR_BUILD): sysinfo.o syslex.o - $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) -o $@ sysinfo.o syslex.o + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.o syslex.o syslex.o: syslex.c sysinfo.h config.h if [ -r syslex.c ]; then \ - $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS) syslex.c -Wno-error ; \ + $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) syslex.c -Wno-error ; \ else \ - $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS) $(srcdir)/syslex.c -Wno-error ;\ + $(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/syslex.c -Wno-error ;\ fi sysinfo.o: sysinfo.c if [ -r sysinfo.c ]; then \ - $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS) sysinfo.c -Wno-error ; \ + $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) sysinfo.c -Wno-error ; \ else \ - $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS) $(srcdir)/sysinfo.c -Wno-error ; \ + $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(srcdir)/sysinfo.c -Wno-error ; \ fi bin2c$(EXEEXT_FOR_BUILD): - $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(srcdir)/bin2c.c $(srcdir)/version.c + $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c $(srcdir)/version.c embedspu: embedspu.sh sed "s@^program_transform_name=@program_transform_name=$(program_transform_name)@" < $< > $@ diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 9f418b7..692ea0b 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,11 @@ +2009-08-28 H.J. Lu <hongjiu.lu@intel.com> + + * Makefile.am (COMPILE_FOR_BUILD): Remove BUILD_CPPFLAGS. + Replace BUILD_CFLAGS with CFLAGS_FOR_BUILD. + (LINK_FOR_BUILD): Replace BUILD_CFLAGS/BUILD_LDFLAGS with + CFLAGS_FOR_BUILD/LDFLAGS_FOR_BUILD. + * Makefile.in: Regenerated. + 2009-08-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * Makefile.am (bfdlibdir, bfdincludedir): Move definition ... diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 4f9a390..7b8bc12 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -14,8 +14,9 @@ NO_WERROR = @NO_WERROR@ AM_CFLAGS = $(WARN_CFLAGS) COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(INCLUDES) $(AM_CPPFLAGS) \ - $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) -LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ + $(CFLAGS_FOR_BUILD) +LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) \ + $(LDFLAGS_FOR_BUILD) -o $@ libopcodes_la_LDFLAGS = if INSTALL_LIBBFD diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index 80189ac..09a10c7 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -291,9 +291,11 @@ INCDIR = $(srcdir)/../include BFDDIR = $(srcdir)/../bfd AM_CFLAGS = $(WARN_CFLAGS) COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(INCLUDES) $(AM_CPPFLAGS) \ - $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) + $(CFLAGS_FOR_BUILD) + +LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) \ + $(LDFLAGS_FOR_BUILD) -o $@ -LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o $@ libopcodes_la_LDFLAGS = $(am__append_1) -release `cat \ ../bfd/libtool-soversion` @SHARED_LDFLAGS@ @INSTALL_LIBBFD_TRUE@bfdlib_LTLIBRARIES = libopcodes.la |