diff options
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 7 | ||||
| -rw-r--r-- | binutils/Makefile.am | 6 | ||||
| -rw-r--r-- | binutils/Makefile.in | 21 |
3 files changed, 22 insertions, 12 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 500e057..7d8f48f 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,12 @@ 2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + * Makefile.am (AM_CPPFLAGS): Renamed from ... + (INCLUDES): ... this. + (bin2c$(EXEEXT_FOR_BUILD): Adjust rule. + (installcheck-local): Renamed from ... + (installcheck): ... this. + * Makefile.in: Regenerate. + * Makefile.am (AUTOMAKE_OPTIONS): Remove cygnus, add no-dist and foreign. (MKDEP, CLEANFILES): Remove now-unneeded variables. diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 9dc5295..aab446d 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -69,7 +69,7 @@ BASEDIR = $(srcdir)/.. BFDDIR = $(BASEDIR)/bfd INCDIR = $(BASEDIR)/include -INCLUDES = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ +AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ @HDEFINES@ \ @INCINTL@ \ -DLOCALEDIR="\"$(datadir)/locale\"" \ @@ -150,7 +150,7 @@ check-DEJAGNU: site.exp else echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi -installcheck: +installcheck-local: /bin/sh $(srcdir)/sanity.sh $(bindir) # There's no global DEPENDENCIES. So, we must explicitly list everything @@ -263,7 +263,7 @@ sysinfo.o: sysinfo.c fi bin2c$(EXEEXT_FOR_BUILD): - $(CC_FOR_BUILD) -o $@ $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(srcdir)/bin2c.c $(srcdir)/version.c + $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(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 ecce5b8..5286142 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -408,7 +408,7 @@ TOOL_PROGS = nm-new strip-new ar ranlib dlltool objdump objcopy BASEDIR = $(srcdir)/.. BFDDIR = $(BASEDIR)/bfd INCDIR = $(BASEDIR)/include -INCLUDES = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ +AM_CPPFLAGS = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \ @HDEFINES@ \ @INCINTL@ \ -DLOCALEDIR="\"$(datadir)/locale\"" \ @@ -1005,6 +1005,8 @@ uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ @@ -1087,7 +1089,7 @@ install-ps: install-ps-recursive install-ps-am: -installcheck-am: +installcheck-am: installcheck-local maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -1126,11 +1128,12 @@ uninstall-am: uninstall-binPROGRAMS install-exec install-exec-am install-exec-local install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am uninstall-binPROGRAMS + install-strip installcheck installcheck-am installcheck-local \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-binPROGRAMS po/POTFILES.in: @MAINT@ Makefile for f in $(POTFILES); do echo $$f; done | LC_ALL=C sort > tmp \ @@ -1148,7 +1151,7 @@ check-DEJAGNU: site.exp else echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi -installcheck: +installcheck-local: /bin/sh $(srcdir)/sanity.sh $(bindir) objdump.o:objdump.c @@ -1202,7 +1205,7 @@ sysinfo.o: sysinfo.c fi bin2c$(EXEEXT_FOR_BUILD): - $(CC_FOR_BUILD) -o $@ $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(srcdir)/bin2c.c $(srcdir)/version.c + $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(srcdir)/bin2c.c $(srcdir)/version.c embedspu: embedspu.sh sed "s@^program_transform_name=@program_transform_name=$(program_transform_name)@" < $< > $@ |