diff options
Diffstat (limited to 'gas')
-rw-r--r-- | gas/ChangeLog | 12 | ||||
-rw-r--r-- | gas/Makefile.am | 29 | ||||
-rw-r--r-- | gas/Makefile.in | 30 | ||||
-rwxr-xr-x | gas/configure | 4 | ||||
-rw-r--r-- | gas/configure.in | 3 | ||||
-rw-r--r-- | gas/doc/Makefile.am | 14 | ||||
-rw-r--r-- | gas/doc/Makefile.in | 14 | ||||
-rw-r--r-- | gas/po/Make-in | 1 |
8 files changed, 105 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 1c5d4c7..fcb1f9d 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,15 @@ +2009-02-03 Carlos O'Donell <carlos@codesourcery.com> + + * configure.in: AC_SUBST pdfdir. + * Makefile.am: Add install-pdf, install-pdf-am, + and install-pdf-recursive targets. + * doc/Makefile.am: Define pdf__strip_dir. Add + install-pdf and install-pdf-am targets. + * po/Make-in: Add install-pdf target. + * configure: Regenerate. + * Makefile.in: Regenerate. + * doc/Makefile.in: Regenerate. + 2009-02-03 Maxim Kuvyrkov <maxim@codesourcery.com> * config/m68k-parse.h (enum pic_relocation): Add values for TLS diff --git a/gas/Makefile.am b/gas/Makefile.am index 5502356..228624e 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -714,6 +714,35 @@ MOSTLYCLEANFILES = $(STAGESTUFF) core \ CLEANFILES = dep.sed DEPTC DEPTCA DEPOBJ DEPOBJA DEP2 DEP2A DEP1 DEPA DEP DEPDIR +.PHONY: install-pdf install-pdf-am install-pdf-recursive + +install-pdf: install-pdf-recursive + +install-pdf-recursive: + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + .PHONY: install-html install-html-am install-html-recursive install-html: install-html-recursive diff --git a/gas/Makefile.in b/gas/Makefile.in index 3dca93d..2cf670d 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -261,6 +261,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ obj_format = @obj_format@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ @@ -2711,6 +2712,35 @@ cgen.o: cgen.c cgen.h cgen-desc.h subsegs.h \ $(srcdir)/../opcodes/$(CGEN_CPU_PREFIX)-desc.h \ $(srcdir)/../opcodes/$(CGEN_CPU_PREFIX)-opc.h +.PHONY: install-pdf install-pdf-am install-pdf-recursive + +install-pdf: install-pdf-recursive + +install-pdf-recursive: + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + .PHONY: install-html install-html-am install-html-recursive install-html: install-html-recursive diff --git a/gas/configure b/gas/configure index df41825..da3f0e7 100755 --- a/gas/configure +++ b/gas/configure @@ -458,7 +458,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM LN_S OBJDUMP ac_ct_OBJDUMP AR ac_ct_AR RANLIB ac_ct_RANLIB lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 WARN_CFLAGS NO_WERROR GDBINIT cgen_cpu_prefix extra_objects target_cpu_type obj_format te_file install_tooldir atof OPCODES_LIB YACC LEX LEXLIB LEX_OUTPUT_ROOT USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT MKINSTALLDIRS MSGFMT MSGMERGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GENINSRC_NEVER_TRUE GENINSRC_NEVER_FALSE ALLOCA LIBM datarootdir docdir htmldir LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN NM LN_S OBJDUMP ac_ct_OBJDUMP AR ac_ct_AR RANLIB ac_ct_RANLIB lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 WARN_CFLAGS NO_WERROR GDBINIT cgen_cpu_prefix extra_objects target_cpu_type obj_format te_file install_tooldir atof OPCODES_LIB YACC LEX LEXLIB LEX_OUTPUT_ROOT USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT MKINSTALLDIRS MSGFMT MSGMERGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GENINSRC_NEVER_TRUE GENINSRC_NEVER_FALSE ALLOCA LIBM datarootdir docdir htmldir pdfdir LIBOBJS LTLIBOBJS' ac_subst_files='' ac_pwd=`pwd` @@ -15149,6 +15149,7 @@ esac + ac_config_files="$ac_config_files Makefile doc/Makefile po/Makefile.in:po/Make-in" ac_config_commands="$ac_config_commands default" @@ -16196,6 +16197,7 @@ s,@LIBM@,$LIBM,;t t s,@datarootdir@,$datarootdir,;t t s,@docdir@,$docdir,;t t s,@htmldir@,$htmldir,;t t +s,@pdfdir@,$pdfdir,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/gas/configure.in b/gas/configure.in index 7c2322d..242bac7 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -692,10 +692,11 @@ AC_CHECK_DECLS([vsnprintf]) BFD_BINARY_FOPEN -dnl Required for html and install-html targets. +dnl Required for html, pdf, install-pdf and install-html targets. AC_SUBST(datarootdir) AC_SUBST(docdir) AC_SUBST(htmldir) +AC_SUBST(pdfdir) dnl This must come last. diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am index 5dc43b6..4c6816b 100644 --- a/gas/doc/Makefile.am +++ b/gas/doc/Makefile.am @@ -71,6 +71,20 @@ CPU_DOCS = \ # cygnus option. install-data-local: install-info +pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + +install-pdf: install-pdf-am + +install-pdf-am: $(PDFS) + @$(NORMAL_INSTALL) + test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)" + @list='$(PDFS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(pdf__strip_dir) \ + echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ + done + html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; install-html: install-html-am diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in index 0f9333d..b84aa1f 100644 --- a/gas/doc/Makefile.in +++ b/gas/doc/Makefile.in @@ -216,6 +216,7 @@ mandir = @mandir@ mkdir_p = @mkdir_p@ obj_format = @obj_format@ oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ sbindir = @sbindir@ @@ -287,6 +288,7 @@ CPU_DOCS = \ c-z80.texi \ c-z8k.texi +pdf__strip_dir = `echo $$p | sed -e 's|^.*/||'`; html__strip_dir = `echo $$p | sed -e 's|^.*/||'`; # This one isn't ready for prime time yet. Not even a little bit. @@ -625,6 +627,18 @@ asconfig.texi: $(CONFIG).texi # cygnus option. install-data-local: install-info +install-pdf: install-pdf-am + +install-pdf-am: $(PDFS) + @$(NORMAL_INSTALL) + test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)" + @list='$(PDFS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(pdf__strip_dir) \ + echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \ + done + install-html: install-html-am install-html-am: $(HTMLS) diff --git a/gas/po/Make-in b/gas/po/Make-in index f321ad7..1157e8e 100644 --- a/gas/po/Make-in +++ b/gas/po/Make-in @@ -113,6 +113,7 @@ install: install-exec install-data install-exec: install-info: install-html: +install-pdf: install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all |