- Olena-patches

last-svn-commit-562-g913844f Fix the distribution of Libiberty.
by Roland Levillain 09 Nov '10

09 Nov '10

* libiberty.mk: New. Include it... * Makefile.am: ...here. * mkinstalldirs, move-if-change: New scripts. Imported from CVS GNU Binutils. --- extatica/ChangeLog | 10 +++ extatica/Makefile.am | 3 + extatica/libiberty.mk | 128 +++++++++++++++++++++++++++++++++++++ extatica/mkinstalldirs | 162 +++++++++++++++++++++++++++++++++++++++++++++++ extatica/move-if-change | 22 +++++++ 5 files changed, 325 insertions(+), 0 deletions(-) create mode 100644 extatica/libiberty.mk create mode 100755 extatica/mkinstalldirs create mode 100755 extatica/move-if-change diff --git a/extatica/ChangeLog b/extatica/ChangeLog index bf909e5..f59d675 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,15 @@ 2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix the distribution of Libiberty. + + * libiberty.mk: New. + Include it... + * Makefile.am: ...here. + * mkinstalldirs, move-if-change: New scripts. + Imported from CVS GNU Binutils. + +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix cleaning rules in Libiberty. * libiberty/Makefile.in (distclean): Remove configure.lineno and diff --git a/extatica/Makefile.am b/extatica/Makefile.am index aa17de5..f4019ed 100644 --- a/extatica/Makefile.am +++ b/extatica/Makefile.am @@ -27,3 +27,6 @@ EXTRA_DIST = bootstrap # `configure' wrapper used in recursive configuration. EXTRA_DIST += configure.gnu + +# Libiberty support. +include $(srcdir)/libiberty.mk diff --git a/extatica/libiberty.mk b/extatica/libiberty.mk new file mode 100644 index 0000000..8f8b0be --- /dev/null +++ b/extatica/libiberty.mk @@ -0,0 +1,128 @@ +# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +# +# This file is part of Olena. +# +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Olena. If not, see <http://www.gnu.org/licenses/>. + +# Files from Libiberty not located in libiberty/. +EXTRA_DIST += \ + config.guess config.sub install-sh \ + \ + config/acx.m4 config/warnings.m4 \ + \ + include/alloca-conf.h include/ansidecl.h include/aout/adobe.h \ + include/aout/aout64.h include/aout/ar.h include/aout/ChangeLog \ + include/aout/dynix3.h include/aout/encap.h include/aout/host.h \ + include/aout/hp.h include/aout/hp300hpux.h include/aout/hppa.h \ + include/aout/ranlib.h include/aout/reloc.h include/aout/stab.def \ + include/aout/stab_gnu.h include/aout/sun4.h include/bfdlink.h \ + include/binary-io.h include/bout.h include/cgen/basic-modes.h \ + include/cgen/basic-ops.h include/cgen/bitset.h \ + include/cgen/ChangeLog include/ChangeLog include/ChangeLog-9103 \ + include/coff/alpha.h include/coff/apollo.h include/coff/arm.h \ + include/coff/aux-coff.h include/coff/ChangeLog \ + include/coff/ChangeLog-9103 include/coff/ecoff.h \ + include/coff/external.h include/coff/go32exe.h include/coff/h8300.h \ + include/coff/h8500.h include/coff/i386.h include/coff/i860.h \ + include/coff/i960.h include/coff/ia64.h include/coff/internal.h \ + include/coff/m68k.h include/coff/m88k.h include/coff/mcore.h \ + include/coff/mips.h include/coff/mipspe.h include/coff/or32.h \ + include/coff/pe.h include/coff/powerpc.h include/coff/rs6000.h \ + include/coff/rs6k64.h include/coff/sh.h include/coff/sparc.h \ + include/coff/sym.h include/coff/symconst.h include/coff/ti.h \ + include/coff/tic30.h include/coff/tic4x.h include/coff/tic54x.h \ + include/coff/tic80.h include/coff/w65.h include/coff/we32k.h \ + include/coff/x86_64.h include/coff/xcoff.h include/coff/z80.h \ + include/coff/z8k.h include/COPYING include/COPYING3 \ + include/demangle.h include/dis-asm.h include/dwarf2.h \ + include/dyn-string.h include/elf/alpha.h include/elf/arc.h \ + include/elf/arm.h include/elf/avr.h include/elf/bfin.h \ + include/elf/ChangeLog include/elf/ChangeLog-9103 \ + include/elf/common.h include/elf/cr16.h include/elf/cr16c.h \ + include/elf/cris.h include/elf/crx.h include/elf/d10v.h \ + include/elf/d30v.h include/elf/dlx.h include/elf/dwarf.h \ + include/elf/external.h include/elf/fr30.h include/elf/frv.h \ + include/elf/h8.h include/elf/hppa.h include/elf/i370.h \ + include/elf/i386.h include/elf/i860.h include/elf/i960.h \ + include/elf/ia64.h include/elf/internal.h include/elf/ip2k.h \ + include/elf/iq2000.h include/elf/lm32.h include/elf/m32c.h \ + include/elf/m32r.h include/elf/m68hc11.h include/elf/m68k.h \ + include/elf/mcore.h include/elf/mep.h include/elf/microblaze.h \ + include/elf/mips.h include/elf/mmix.h include/elf/mn10200.h \ + include/elf/mn10300.h include/elf/moxie.h include/elf/msp430.h \ + include/elf/mt.h include/elf/openrisc.h include/elf/or32.h \ + include/elf/pj.h include/elf/ppc.h include/elf/ppc64.h \ + include/elf/reloc-macros.h include/elf/rx.h include/elf/s390.h \ + include/elf/score.h include/elf/sh.h include/elf/sparc.h \ + include/elf/spu.h include/elf/tic6x-attrs.h include/elf/tic6x.h \ + include/elf/v850.h include/elf/vax.h include/elf/vxworks.h \ + include/elf/x86-64.h include/elf/xc16x.h include/elf/xstormy16.h \ + include/elf/xtensa.h include/fibheap.h include/filenames.h \ + include/floatformat.h include/fnmatch.h include/fopen-bin.h \ + include/fopen-same.h include/fopen-vms.h include/gdb/callback.h \ + include/gdb/ChangeLog include/gdb/fileio.h include/gdb/remote-sim.h \ + include/gdb/signals.def include/gdb/signals.h include/gdb/sim-arm.h \ + include/gdb/sim-cr16.h include/gdb/sim-d10v.h include/gdb/sim-frv.h \ + include/gdb/sim-h8300.h include/gdb/sim-lm32.h \ + include/gdb/sim-m32c.h include/gdb/sim-ppc.h include/gdb/sim-rx.h \ + include/gdb/sim-sh.h include/gdbm.h include/getopt.h \ + include/hashtab.h include/hp-symtab.h include/ieee.h \ + include/libiberty.h include/lto-symtab.h include/MAINTAINERS \ + include/md5.h include/nlm/alpha-ext.h include/nlm/ChangeLog \ + include/nlm/common.h include/nlm/external.h include/nlm/i386-ext.h \ + include/nlm/internal.h include/nlm/ppc-ext.h \ + include/nlm/sparc32-ext.h include/oasys.h include/objalloc.h \ + include/obstack.h include/opcode/alpha.h include/opcode/arc.h \ + include/opcode/arm.h include/opcode/avr.h include/opcode/bfin.h \ + include/opcode/cgen.h include/opcode/ChangeLog \ + include/opcode/ChangeLog-9103 include/opcode/convex.h \ + include/opcode/cr16.h include/opcode/cris.h include/opcode/crx.h \ + include/opcode/d10v.h include/opcode/d30v.h include/opcode/dlx.h \ + include/opcode/h8300.h include/opcode/hppa.h include/opcode/i370.h \ + include/opcode/i386.h include/opcode/i860.h include/opcode/i960.h \ + include/opcode/ia64.h include/opcode/m68hc11.h include/opcode/m68k.h \ + include/opcode/m88k.h include/opcode/mips.h include/opcode/mmix.h \ + include/opcode/mn10200.h include/opcode/mn10300.h \ + include/opcode/moxie.h include/opcode/msp430.h include/opcode/np1.h \ + include/opcode/ns32k.h include/opcode/or32.h include/opcode/pdp11.h \ + include/opcode/pj.h include/opcode/pn.h include/opcode/ppc.h \ + include/opcode/pyr.h include/opcode/rx.h include/opcode/s390.h \ + include/opcode/score-datadep.h include/opcode/score-inst.h \ + include/opcode/sparc.h include/opcode/spu-insns.h \ + include/opcode/spu.h include/opcode/tahoe.h include/opcode/tic30.h \ + include/opcode/tic4x.h include/opcode/tic54x.h \ + include/opcode/tic6x-control-registers.h \ + include/opcode/tic6x-insn-formats.h \ + include/opcode/tic6x-opcode-table.h include/opcode/tic6x.h \ + include/opcode/tic80.h include/opcode/v850.h include/opcode/vax.h \ + include/os9k.h include/partition.h include/plugin-api.h \ + include/progress.h include/safe-ctype.h include/sha1.h \ + include/som/aout.h include/som/ChangeLog include/som/clock.h \ + include/som/internal.h include/som/lst.h include/som/reloc.h \ + include/sort.h include/splay-tree.h include/symcat.h \ + include/vms/ChangeLog include/vms/dcx.h include/vms/dmt.h \ + include/vms/dsc.h include/vms/dst.h include/vms/eeom.h \ + include/vms/egps.h include/vms/egsd.h include/vms/egst.h \ + include/vms/egsy.h include/vms/eiaf.h include/vms/eicp.h \ + include/vms/eidc.h include/vms/eiha.h include/vms/eihd.h \ + include/vms/eihi.h include/vms/eihs.h include/vms/eihvn.h \ + include/vms/eisd.h include/vms/emh.h include/vms/eobjrec.h \ + include/vms/esdf.h include/vms/esdfm.h include/vms/esdfv.h \ + include/vms/esgps.h include/vms/esrf.h include/vms/etir.h \ + include/vms/internal.h include/vms/lbr.h include/vms/prt.h \ + include/vms/shl.h include/xregex.h include/xregex2.h \ + include/xtensa-config.h include/xtensa-isa-internal.h \ + include/xtensa-isa.h + +# These scripts are required by Libiberty's build system. +EXTRA_DIST += mkinstalldirs move-if-change diff --git a/extatica/mkinstalldirs b/extatica/mkinstalldirs new file mode 100755 index 0000000..4191a45 --- /dev/null +++ b/extatica/mkinstalldirs @@ -0,0 +1,162 @@ +#! /bin/sh +# mkinstalldirs --- make directory hierarchy + +scriptversion=2009-04-28.21; # UTC + +# Original author: Noah Friedman <friedman(a)prep.ai.mit.edu> +# Created: 1993-05-16 +# Public domain. +# +# This file is maintained in Automake, please report +# bugs to <bug-automake(a)gnu.org> or send patches to +# <automake-patches(a)gnu.org>. + +nl=' +' +IFS=" "" $nl" +errstatus=0 +dirmode= + +usage="\ +Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... + +Create each directory DIR (with mode MODE, if specified), including all +leading file name components. + +Report bugs to <bug-automake(a)gnu.org>." + +# process command line arguments +while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help + echo "$usage" + exit $? + ;; + -m) # -m PERM arg + shift + test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } + dirmode=$1 + shift + ;; + --version) + echo "$0 $scriptversion" + exit $? + ;; + --) # stop option processing + shift + break + ;; + -*) # unknown option + echo "$usage" 1>&2 + exit 1 + ;; + *) # first non-opt arg + break + ;; + esac +done + +for file +do + if test -d "$file"; then + shift + else + break + fi +done + +case $# in + 0) exit 0 ;; +esac + +# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and +# mkdir -p a/c at the same time, both will detect that a is missing, +# one will create a, then the other will try to create a and die with +# a "File exists" error. This is a problem when calling mkinstalldirs +# from a parallel make. We use --version in the probe to restrict +# ourselves to GNU mkdir, which is thread-safe. +case $dirmode in + '') + if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" + else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + test -d ./-p && rmdir ./-p + test -d ./--version && rmdir ./--version + fi + ;; + *) + if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && + test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" + else + # Clean up after NextStep and OpenStep mkdir. + for d in ./-m ./-p ./--version "./$dirmode"; + do + test -d $d && rmdir $d + done + fi + ;; +esac + +for file +do + case $file in + /*) pathcomp=/ ;; + *) pathcomp= ;; + esac + oIFS=$IFS + IFS=/ + set fnord $file + shift + IFS=$oIFS + + for d + do + test "x$d" = x && continue + + pathcomp=$pathcomp$d + case $pathcomp in + -*) pathcomp=./$pathcomp ;; + esac + + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + lasterr= + chmod "$dirmode" "$pathcomp" || lasterr=$? + + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi + fi + fi + + pathcomp=$pathcomp/ + done +done + +exit $errstatus + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/extatica/move-if-change b/extatica/move-if-change new file mode 100755 index 0000000..ff74a55 --- /dev/null +++ b/extatica/move-if-change @@ -0,0 +1,22 @@ +#!/bin/sh +# Like mv $1 $2, but if the files are the same, just delete $1. +# Status is zero if successful, nonzero otherwise. + +usage="$0: usage: $0 SOURCE DEST" + +case $# in +2) ;; +*) echo "$usage" >&2; exit 1;; +esac + +for arg in "$1" "$2"; do + case $arg in + -*) echo "$usage" >&2; exit 1;; + esac +done + +if test -r "$2" && cmp -s "$1" "$2"; then + rm -f "$1" +else + mv -f "$1" "$2" +fi -- 1.5.6.5

1 0

last-svn-commit-560-gd919f58 Fix cleaning rules in Libiberty.
by Roland Levillain 09 Nov '10

09 Nov '10

* libiberty/testsuite/Makefile.in (mostlyclean): Remove directories ending in `.dSYM'. --- extatica/ChangeLog | 7 +++++++ extatica/libiberty/testsuite/Makefile.in | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index ab561e6..c5d5e63 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,12 @@ 2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix cleaning rules in Libiberty. + + * libiberty/testsuite/Makefile.in (mostlyclean): Remove + directories ending in `.dSYM'. + +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Make Libiberty compatible with Automake. * libiberty/local.mk: New helper, containing missing recursive diff --git a/extatica/libiberty/testsuite/Makefile.in b/extatica/libiberty/testsuite/Makefile.in index 69ac1f5..e0d2272 100644 --- a/extatica/libiberty/testsuite/Makefile.in +++ b/extatica/libiberty/testsuite/Makefile.in @@ -1,6 +1,6 @@ # # Makefile -# Copyright (C) 1999, 2002, 2006 +# Copyright (C) 1999, 2002, 2006, 2010 # Free Software Foundation # # This file is part of the libiberty library. @@ -77,10 +77,15 @@ html install-html info install-info clean-info dvi pdf install-pdf \ install etags tags installcheck: # The standard clean rules. +# Names ending in `.dSYM' are directories created by the compiler on +# Darwin (Mac OS X). mostlyclean: rm -f test-demangle + rm -rf test-demangle.dSYM rm -f test-pexecute + rm -rf test-pexecute.dSYM rm -f test-expandargv + rm -rf test-expandargv.dSYM rm -f core clean: mostlyclean distclean: clean -- 1.5.6.5

1 0

last-svn-commit-561-gcf101e3 Fix cleaning rules in Libiberty.
by Roland Levillain 09 Nov '10

09 Nov '10

* libiberty/testsuite/Makefile.in (mostlyclean): Remove directories ending in `.dSYM'. --- extatica/ChangeLog | 7 +++++++ extatica/libiberty/testsuite/Makefile.in | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index cc98360..ad3874c 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,12 @@ 2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix cleaning rules in Libiberty. + + * libiberty/testsuite/Makefile.in (mostlyclean): Remove + directories ending in `.dSYM'. + +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Make Libiberty compatible with Automake. * libiberty/local.mk: New helper, containing missing recursive diff --git a/extatica/libiberty/testsuite/Makefile.in b/extatica/libiberty/testsuite/Makefile.in index 69ac1f5..e0d2272 100644 --- a/extatica/libiberty/testsuite/Makefile.in +++ b/extatica/libiberty/testsuite/Makefile.in @@ -1,6 +1,6 @@ # # Makefile -# Copyright (C) 1999, 2002, 2006 +# Copyright (C) 1999, 2002, 2006, 2010 # Free Software Foundation # # This file is part of the libiberty library. @@ -77,10 +77,15 @@ html install-html info install-info clean-info dvi pdf install-pdf \ install etags tags installcheck: # The standard clean rules. +# Names ending in `.dSYM' are directories created by the compiler on +# Darwin (Mac OS X). mostlyclean: rm -f test-demangle + rm -rf test-demangle.dSYM rm -f test-pexecute + rm -rf test-pexecute.dSYM rm -f test-expandargv + rm -rf test-expandargv.dSYM rm -f core clean: mostlyclean distclean: clean -- 1.5.6.5

1 0

last-svn-commit-561-g0117b20 Fix cleaning rules in Libiberty.
by Roland Levillain 09 Nov '10

09 Nov '10

* libiberty/Makefile.in (distclean): Remove configure.lineno and config.status.lineno. * libiberty/testsuite/Makefile.in (mostlyclean): Remove directories ending in `.dSYM'. --- extatica/ChangeLog | 9 +++++++++ extatica/libiberty/Makefile.in | 2 +- extatica/libiberty/testsuite/Makefile.in | 7 ++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index cc98360..bf909e5 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,14 @@ 2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix cleaning rules in Libiberty. + + * libiberty/Makefile.in (distclean): Remove configure.lineno and + config.status.lineno. + * libiberty/testsuite/Makefile.in (mostlyclean): Remove + directories ending in `.dSYM'. + +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Make Libiberty compatible with Automake. * libiberty/local.mk: New helper, containing missing recursive diff --git a/extatica/libiberty/Makefile.in b/extatica/libiberty/Makefile.in index f918fa2..fb5c39d 100644 --- a/extatica/libiberty/Makefile.in +++ b/extatica/libiberty/Makefile.in @@ -430,7 +430,7 @@ distclean: distclean-subdir $(MAKE) SUBDIRS="" clean @$(MULTICLEAN) multi-clean DO=distclean -rm -f *~ Makefile config.cache config.status xhost-mkfrag TAGS multilib.out - -rm -f config.log + -rm -f config.log configure.lineno config.status.lineno -rmdir testsuite 2>/dev/null maintainer-clean realclean: maintainer-clean-subdir $(MAKE) SUBDIRS="" distclean diff --git a/extatica/libiberty/testsuite/Makefile.in b/extatica/libiberty/testsuite/Makefile.in index 69ac1f5..e0d2272 100644 --- a/extatica/libiberty/testsuite/Makefile.in +++ b/extatica/libiberty/testsuite/Makefile.in @@ -1,6 +1,6 @@ # # Makefile -# Copyright (C) 1999, 2002, 2006 +# Copyright (C) 1999, 2002, 2006, 2010 # Free Software Foundation # # This file is part of the libiberty library. @@ -77,10 +77,15 @@ html install-html info install-info clean-info dvi pdf install-pdf \ install etags tags installcheck: # The standard clean rules. +# Names ending in `.dSYM' are directories created by the compiler on +# Darwin (Mac OS X). mostlyclean: rm -f test-demangle + rm -rf test-demangle.dSYM rm -f test-pexecute + rm -rf test-pexecute.dSYM rm -f test-expandargv + rm -rf test-expandargv.dSYM rm -f core clean: mostlyclean distclean: clean -- 1.5.6.5

1 0

last-svn-commit-559-g39fc68e Make Libiberty compatible with Automake.
by Roland Levillain 09 Nov '10

09 Nov '10

* libiberty/local.mk: New helper, containing missing recursive targets. * libiberty/configure.ac: Configure Libiberty's `Makefile' using both `Makefile.in' and `local.mk'. * libiberty/Makefile.in (Makefile): Update the invocation of config.status. --- extatica/ChangeLog | 11 +++ extatica/libiberty/Makefile.in | 4 +- extatica/libiberty/configure.ac | 2 +- extatica/libiberty/local.mk | 151 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 165 insertions(+), 3 deletions(-) create mode 100644 extatica/libiberty/local.mk diff --git a/extatica/ChangeLog b/extatica/ChangeLog index f091a1d..ab561e6 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,3 +1,14 @@ +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + + Make Libiberty compatible with Automake. + + * libiberty/local.mk: New helper, containing missing recursive + targets. + * libiberty/configure.ac: Configure Libiberty's `Makefile' using + both `Makefile.in' and `local.mk'. + * libiberty/Makefile.in (Makefile): Update the invocation of + config.status. + 2010-11-02 Roland Levillain <roland(a)lrde.epita.fr> Have Extatica use the embedded GNU Libiberty. diff --git a/extatica/libiberty/Makefile.in b/extatica/libiberty/Makefile.in index 7ea7595..f918fa2 100644 --- a/extatica/libiberty/Makefile.in +++ b/extatica/libiberty/Makefile.in @@ -2,7 +2,7 @@ # Originally written by K. Richard Pixley <rich(a)cygnus.com>. # # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010 Free Software # Foundation # # This file is part of the libiberty library. @@ -438,7 +438,7 @@ maintainer-clean realclean: maintainer-clean-subdir force: Makefile: $(srcdir)/Makefile.in config.status - CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status + $(SHELL) ./config.status Makefile # Depending on Makefile makes sure that config.status has been re-run # if needed. This prevents problems with parallel builds. diff --git a/extatica/libiberty/configure.ac b/extatica/libiberty/configure.ac index f207283..0ff8e1e 100644 --- a/extatica/libiberty/configure.ac +++ b/extatica/libiberty/configure.ac @@ -722,7 +722,7 @@ AC_SUBST(docdir) AC_SUBST(htmldir) # We need multilib support, but only if configuring for the target. -AC_CONFIG_FILES([Makefile testsuite/Makefile]) +AC_CONFIG_FILES([Makefile:Makefile.in:local.mk] [testsuite/Makefile]) AC_CONFIG_COMMANDS([default], [[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h if test -n "$CONFIG_FILES"; then diff --git a/extatica/libiberty/local.mk b/extatica/libiberty/local.mk new file mode 100644 index 0000000..ec7c3e8 --- /dev/null +++ b/extatica/libiberty/local.mk @@ -0,0 +1,151 @@ +# Provide missing recursive targets required by Automake, so that +# libiberty can be distributed with the hosting project. + +# Have Makefile depend on this helper. +Makefile: $(srcdir)/local.mk + + +# Files to be distributed. +DISTFILES = $(srcdir)/ChangeLog $(srcdir)/README $(srcdir)/COPYING.LIB + +# Source files. +# +# Files listed in `CFILES' are not prefixed by `$(srcdir)/'; use a +# replacement variable. +srcdir_CFILES = \ + $(srcdir)/alloca.c $(srcdir)/argv.c $(srcdir)/asprintf.c \ + $(srcdir)/atexit.c $(srcdir)/basename.c $(srcdir)/bcmp.c \ + $(srcdir)/bcopy.c $(srcdir)/bsearch.c $(srcdir)/bzero.c \ + $(srcdir)/calloc.c $(srcdir)/choose-temp.c $(srcdir)/clock.c \ + $(srcdir)/concat.c $(srcdir)/cp-demangle.c $(srcdir)/cp-demint.c \ + $(srcdir)/cplus-dem.c $(srcdir)/crc32.c $(srcdir)/dyn-string.c \ + $(srcdir)/fdmatch.c $(srcdir)/ffs.c $(srcdir)/fibheap.c \ + $(srcdir)/filename_cmp.c $(srcdir)/floatformat.c $(srcdir)/fnmatch.c \ + $(srcdir)/fopen_unlocked.c $(srcdir)/getcwd.c $(srcdir)/getopt.c \ + $(srcdir)/getopt1.c $(srcdir)/getpagesize.c $(srcdir)/getpwd.c \ + $(srcdir)/getruntime.c $(srcdir)/gettimeofday.c $(srcdir)/hashtab.c \ + $(srcdir)/hex.c $(srcdir)/index.c $(srcdir)/insque.c \ + $(srcdir)/lbasename.c $(srcdir)/lrealpath.c \ + $(srcdir)/make-relative-prefix.c $(srcdir)/make-temp-file.c \ + $(srcdir)/md5.c $(srcdir)/memchr.c $(srcdir)/memcmp.c \ + $(srcdir)/memcpy.c $(srcdir)/memmem.c $(srcdir)/memmove.c \ + $(srcdir)/mempcpy.c $(srcdir)/memset.c $(srcdir)/mkstemps.c \ + $(srcdir)/objalloc.c $(srcdir)/obstack.c $(srcdir)/partition.c \ + $(srcdir)/pexecute.c $(srcdir)/pex-common.c $(srcdir)/pex-djgpp.c \ + $(srcdir)/pex-msdos.c $(srcdir)/pex-one.c $(srcdir)/pex-unix.c \ + $(srcdir)/pex-win32.c $(srcdir)/physmem.c $(srcdir)/putenv.c \ + $(srcdir)/random.c $(srcdir)/regex.c $(srcdir)/rename.c \ + $(srcdir)/rindex.c $(srcdir)/safe-ctype.c $(srcdir)/setenv.c \ + $(srcdir)/setproctitle.c $(srcdir)/sha1.c $(srcdir)/sigsetmask.c \ + $(srcdir)/snprintf.c $(srcdir)/sort.c $(srcdir)/spaces.c \ + $(srcdir)/splay-tree.c $(srcdir)/stpcpy.c $(srcdir)/stpncpy.c \ + $(srcdir)/strcasecmp.c $(srcdir)/strchr.c $(srcdir)/strdup.c \ + $(srcdir)/strerror.c $(srcdir)/strncasecmp.c $(srcdir)/strncmp.c \ + $(srcdir)/strrchr.c $(srcdir)/strsignal.c $(srcdir)/strstr.c \ + $(srcdir)/strtod.c $(srcdir)/strtol.c $(srcdir)/strtoul.c \ + $(srcdir)/strndup.c $(srcdir)/strverscmp.c $(srcdir)/tmpnam.c \ + $(srcdir)/unlink-if-ordinary.c $(srcdir)/vasprintf.c \ + $(srcdir)/vfork.c $(srcdir)/vfprintf.c $(srcdir)/vprintf.c \ + $(srcdir)/vsnprintf.c $(srcdir)/vsprintf.c $(srcdir)/waitpid.c \ + $(srcdir)/xatexit.c $(srcdir)/xexit.c $(srcdir)/xmalloc.c \ + $(srcdir)/xmemdup.c $(srcdir)/xstrdup.c $(srcdir)/xstrerror.c \ + $(srcdir)/xstrndup.c +DISTFILES += $(srcdir_CFILES) $(srcdir)/cp-demangle.h $(srcdir)/pex-common.h + +# Configuration. +DISTFILES += \ + $(srcdir)/aclocal.m4 \ + $(srcdir)/config.h-vms \ + $(srcdir)/config.in \ + $(srcdir)/config/mh-aix \ + $(srcdir)/config/mh-cxux7 \ + $(srcdir)/config/mh-fbsd21 \ + $(srcdir)/config/mh-openedition \ + $(srcdir)/config/mh-windows \ + $(srcdir)/configure \ + $(srcdir)/configure.ac \ + $(srcdir)/configure.com + +# Construction. +DISTFILES += \ + $(srcdir)/Makefile.in \ + $(srcdir)/local.mk \ + $(srcdir)/makefile.vms \ + $(srcdir)/testsuite/Makefile.in + +# Documentation. +# +# Files listed in TEXIFILES are not prefixed by `$(srcdir)/'; use +# a replacement variable. +srcdir_TEXIFILES = $(srcdir)/fnmatch.txh $(srcdir)/pexecute.txh +DISTFILES += $(TEXISRC) $(srcdir_TEXIFILES) $(srcdir)/at-file.texi + +# Scripts. +DISTFILES += $(srcdir)/maint-tool $(srcdir)/gather-docs + +# Tests. +DISTFILES += \ + $(srcdir)/testsuite/demangle-expected \ + $(srcdir)/testsuite/test-demangle.c \ + $(srcdir)/testsuite/test-expandargv.c \ + $(srcdir)/testsuite/test-pexecute.c + + +# The following recursive targets are missing from Libiberty's +# `Makefile.in'. + +# `Makefile/in' defines `mkdir_p', not `MKDIR_P'. +MKDIR_P = $(mkdir_p) + +# Copied from a `Makefile.in' generated by Automake. +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + +installdirs: # FIXME: Write me. +# Use something like this: +# +# for dir in "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(pythondir)"; do \ +# test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +# done +# +# ? + +install-dvi: # FIXME: Write me. + +uninstall: # FIXME: Write me. + +.PHONY: distdir installdirs install-dvi uninstall + + +# Targets doing nothing. +EMPTY_AUTOMAKE_TARGETS = ps install-ps install-data install-exec ctags +.PHONY: $(EMPTY_AUTOMAKE_TARGETS) +$(EMPTY_AUTOMAKE_TARGETS): -- 1.5.6.5

1 0

last-svn-commit-560-gc1521eb Make Libiberty compatible with Automake.
by Roland Levillain 09 Nov '10

09 Nov '10

* libiberty/local.mk: New helper, containing missing recursive targets. * libiberty/configure.ac: Configure Libiberty's `Makefile' using both `Makefile.in' and `local.mk'. * libiberty/Makefile.in (Makefile): Update the invocation of config.status. --- extatica/ChangeLog | 11 +++ extatica/libiberty/Makefile.in | 4 +- extatica/libiberty/configure.ac | 2 +- extatica/libiberty/local.mk | 151 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 165 insertions(+), 3 deletions(-) create mode 100644 extatica/libiberty/local.mk diff --git a/extatica/ChangeLog b/extatica/ChangeLog index 0070d55..cc98360 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,3 +1,14 @@ +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + + Make Libiberty compatible with Automake. + + * libiberty/local.mk: New helper, containing missing recursive + targets. + * libiberty/configure.ac: Configure Libiberty's `Makefile' using + both `Makefile.in' and `local.mk'. + * libiberty/Makefile.in (Makefile): Update the invocation of + config.status. + 2010-11-02 Roland Levillain <roland(a)lrde.epita.fr> Have Extatica use the embedded GNU Libiberty. diff --git a/extatica/libiberty/Makefile.in b/extatica/libiberty/Makefile.in index 7ea7595..f918fa2 100644 --- a/extatica/libiberty/Makefile.in +++ b/extatica/libiberty/Makefile.in @@ -2,7 +2,7 @@ # Originally written by K. Richard Pixley <rich(a)cygnus.com>. # # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010 Free Software # Foundation # # This file is part of the libiberty library. @@ -438,7 +438,7 @@ maintainer-clean realclean: maintainer-clean-subdir force: Makefile: $(srcdir)/Makefile.in config.status - CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status + $(SHELL) ./config.status Makefile # Depending on Makefile makes sure that config.status has been re-run # if needed. This prevents problems with parallel builds. diff --git a/extatica/libiberty/configure.ac b/extatica/libiberty/configure.ac index f207283..0ff8e1e 100644 --- a/extatica/libiberty/configure.ac +++ b/extatica/libiberty/configure.ac @@ -722,7 +722,7 @@ AC_SUBST(docdir) AC_SUBST(htmldir) # We need multilib support, but only if configuring for the target. -AC_CONFIG_FILES([Makefile testsuite/Makefile]) +AC_CONFIG_FILES([Makefile:Makefile.in:local.mk] [testsuite/Makefile]) AC_CONFIG_COMMANDS([default], [[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h if test -n "$CONFIG_FILES"; then diff --git a/extatica/libiberty/local.mk b/extatica/libiberty/local.mk new file mode 100644 index 0000000..ec7c3e8 --- /dev/null +++ b/extatica/libiberty/local.mk @@ -0,0 +1,151 @@ +# Provide missing recursive targets required by Automake, so that +# libiberty can be distributed with the hosting project. + +# Have Makefile depend on this helper. +Makefile: $(srcdir)/local.mk + + +# Files to be distributed. +DISTFILES = $(srcdir)/ChangeLog $(srcdir)/README $(srcdir)/COPYING.LIB + +# Source files. +# +# Files listed in `CFILES' are not prefixed by `$(srcdir)/'; use a +# replacement variable. +srcdir_CFILES = \ + $(srcdir)/alloca.c $(srcdir)/argv.c $(srcdir)/asprintf.c \ + $(srcdir)/atexit.c $(srcdir)/basename.c $(srcdir)/bcmp.c \ + $(srcdir)/bcopy.c $(srcdir)/bsearch.c $(srcdir)/bzero.c \ + $(srcdir)/calloc.c $(srcdir)/choose-temp.c $(srcdir)/clock.c \ + $(srcdir)/concat.c $(srcdir)/cp-demangle.c $(srcdir)/cp-demint.c \ + $(srcdir)/cplus-dem.c $(srcdir)/crc32.c $(srcdir)/dyn-string.c \ + $(srcdir)/fdmatch.c $(srcdir)/ffs.c $(srcdir)/fibheap.c \ + $(srcdir)/filename_cmp.c $(srcdir)/floatformat.c $(srcdir)/fnmatch.c \ + $(srcdir)/fopen_unlocked.c $(srcdir)/getcwd.c $(srcdir)/getopt.c \ + $(srcdir)/getopt1.c $(srcdir)/getpagesize.c $(srcdir)/getpwd.c \ + $(srcdir)/getruntime.c $(srcdir)/gettimeofday.c $(srcdir)/hashtab.c \ + $(srcdir)/hex.c $(srcdir)/index.c $(srcdir)/insque.c \ + $(srcdir)/lbasename.c $(srcdir)/lrealpath.c \ + $(srcdir)/make-relative-prefix.c $(srcdir)/make-temp-file.c \ + $(srcdir)/md5.c $(srcdir)/memchr.c $(srcdir)/memcmp.c \ + $(srcdir)/memcpy.c $(srcdir)/memmem.c $(srcdir)/memmove.c \ + $(srcdir)/mempcpy.c $(srcdir)/memset.c $(srcdir)/mkstemps.c \ + $(srcdir)/objalloc.c $(srcdir)/obstack.c $(srcdir)/partition.c \ + $(srcdir)/pexecute.c $(srcdir)/pex-common.c $(srcdir)/pex-djgpp.c \ + $(srcdir)/pex-msdos.c $(srcdir)/pex-one.c $(srcdir)/pex-unix.c \ + $(srcdir)/pex-win32.c $(srcdir)/physmem.c $(srcdir)/putenv.c \ + $(srcdir)/random.c $(srcdir)/regex.c $(srcdir)/rename.c \ + $(srcdir)/rindex.c $(srcdir)/safe-ctype.c $(srcdir)/setenv.c \ + $(srcdir)/setproctitle.c $(srcdir)/sha1.c $(srcdir)/sigsetmask.c \ + $(srcdir)/snprintf.c $(srcdir)/sort.c $(srcdir)/spaces.c \ + $(srcdir)/splay-tree.c $(srcdir)/stpcpy.c $(srcdir)/stpncpy.c \ + $(srcdir)/strcasecmp.c $(srcdir)/strchr.c $(srcdir)/strdup.c \ + $(srcdir)/strerror.c $(srcdir)/strncasecmp.c $(srcdir)/strncmp.c \ + $(srcdir)/strrchr.c $(srcdir)/strsignal.c $(srcdir)/strstr.c \ + $(srcdir)/strtod.c $(srcdir)/strtol.c $(srcdir)/strtoul.c \ + $(srcdir)/strndup.c $(srcdir)/strverscmp.c $(srcdir)/tmpnam.c \ + $(srcdir)/unlink-if-ordinary.c $(srcdir)/vasprintf.c \ + $(srcdir)/vfork.c $(srcdir)/vfprintf.c $(srcdir)/vprintf.c \ + $(srcdir)/vsnprintf.c $(srcdir)/vsprintf.c $(srcdir)/waitpid.c \ + $(srcdir)/xatexit.c $(srcdir)/xexit.c $(srcdir)/xmalloc.c \ + $(srcdir)/xmemdup.c $(srcdir)/xstrdup.c $(srcdir)/xstrerror.c \ + $(srcdir)/xstrndup.c +DISTFILES += $(srcdir_CFILES) $(srcdir)/cp-demangle.h $(srcdir)/pex-common.h + +# Configuration. +DISTFILES += \ + $(srcdir)/aclocal.m4 \ + $(srcdir)/config.h-vms \ + $(srcdir)/config.in \ + $(srcdir)/config/mh-aix \ + $(srcdir)/config/mh-cxux7 \ + $(srcdir)/config/mh-fbsd21 \ + $(srcdir)/config/mh-openedition \ + $(srcdir)/config/mh-windows \ + $(srcdir)/configure \ + $(srcdir)/configure.ac \ + $(srcdir)/configure.com + +# Construction. +DISTFILES += \ + $(srcdir)/Makefile.in \ + $(srcdir)/local.mk \ + $(srcdir)/makefile.vms \ + $(srcdir)/testsuite/Makefile.in + +# Documentation. +# +# Files listed in TEXIFILES are not prefixed by `$(srcdir)/'; use +# a replacement variable. +srcdir_TEXIFILES = $(srcdir)/fnmatch.txh $(srcdir)/pexecute.txh +DISTFILES += $(TEXISRC) $(srcdir_TEXIFILES) $(srcdir)/at-file.texi + +# Scripts. +DISTFILES += $(srcdir)/maint-tool $(srcdir)/gather-docs + +# Tests. +DISTFILES += \ + $(srcdir)/testsuite/demangle-expected \ + $(srcdir)/testsuite/test-demangle.c \ + $(srcdir)/testsuite/test-expandargv.c \ + $(srcdir)/testsuite/test-pexecute.c + + +# The following recursive targets are missing from Libiberty's +# `Makefile.in'. + +# `Makefile/in' defines `mkdir_p', not `MKDIR_P'. +MKDIR_P = $(mkdir_p) + +# Copied from a `Makefile.in' generated by Automake. +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + +installdirs: # FIXME: Write me. +# Use something like this: +# +# for dir in "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(pythondir)"; do \ +# test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +# done +# +# ? + +install-dvi: # FIXME: Write me. + +uninstall: # FIXME: Write me. + +.PHONY: distdir installdirs install-dvi uninstall + + +# Targets doing nothing. +EMPTY_AUTOMAKE_TARGETS = ps install-ps install-data install-exec ctags +.PHONY: $(EMPTY_AUTOMAKE_TARGETS) +$(EMPTY_AUTOMAKE_TARGETS): -- 1.5.6.5

1 0

last-svn-commit-560-g92c53da Make Libiberty compatible with Automake.
by Roland Levillain 09 Nov '10

09 Nov '10

* libiberty/local.mk: New helper, containing missing recursive targets. * libiberty/configure.ac: Configure Libiberty's `Makefile' using both `Makefile.in' and `local.mk'. * libiberty/Makefile.in (Makefile): Update the invocation of config.status. --- extatica/ChangeLog | 11 +++ extatica/libiberty/Makefile.in | 4 +- extatica/libiberty/configure.ac | 2 +- extatica/libiberty/local.mk | 151 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 165 insertions(+), 3 deletions(-) create mode 100644 extatica/libiberty/local.mk diff --git a/extatica/ChangeLog b/extatica/ChangeLog index 0070d55..cc98360 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,3 +1,14 @@ +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + + Make Libiberty compatible with Automake. + + * libiberty/local.mk: New helper, containing missing recursive + targets. + * libiberty/configure.ac: Configure Libiberty's `Makefile' using + both `Makefile.in' and `local.mk'. + * libiberty/Makefile.in (Makefile): Update the invocation of + config.status. + 2010-11-02 Roland Levillain <roland(a)lrde.epita.fr> Have Extatica use the embedded GNU Libiberty. diff --git a/extatica/libiberty/Makefile.in b/extatica/libiberty/Makefile.in index 7ea7595..f918fa2 100644 --- a/extatica/libiberty/Makefile.in +++ b/extatica/libiberty/Makefile.in @@ -2,7 +2,7 @@ # Originally written by K. Richard Pixley <rich(a)cygnus.com>. # # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2010 Free Software # Foundation # # This file is part of the libiberty library. @@ -438,7 +438,7 @@ maintainer-clean realclean: maintainer-clean-subdir force: Makefile: $(srcdir)/Makefile.in config.status - CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status + $(SHELL) ./config.status Makefile # Depending on Makefile makes sure that config.status has been re-run # if needed. This prevents problems with parallel builds. diff --git a/extatica/libiberty/configure.ac b/extatica/libiberty/configure.ac index f207283..0ff8e1e 100644 --- a/extatica/libiberty/configure.ac +++ b/extatica/libiberty/configure.ac @@ -722,7 +722,7 @@ AC_SUBST(docdir) AC_SUBST(htmldir) # We need multilib support, but only if configuring for the target. -AC_CONFIG_FILES([Makefile testsuite/Makefile]) +AC_CONFIG_FILES([Makefile:Makefile.in:local.mk] [testsuite/Makefile]) AC_CONFIG_COMMANDS([default], [[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h if test -n "$CONFIG_FILES"; then diff --git a/extatica/libiberty/local.mk b/extatica/libiberty/local.mk new file mode 100644 index 0000000..3af465f --- /dev/null +++ b/extatica/libiberty/local.mk @@ -0,0 +1,151 @@ +# Provide missing recursive targets required by Automake, so that +# libiberty can be distributed with the hosting project. + +# Have Makefile depend on this helper. +Makefile: $(srcdir)/local.mk + + +# Files to be distributed. +DISTFILES = $(srcdir)/ChangeLog $(srcdir)/README $(srcdir)/COPYING.LIB + +# Source files. +# +# Files listed in `CFILES' are not prefixed by `$(srcdir)/'; use a +# replacement variable. +srcdir_CFILES = \ + $(srcdir)/alloca.c $(srcdir)/argv.c $(srcdir)/asprintf.c \ + $(srcdir)/atexit.c $(srcdir)/basename.c $(srcdir)/bcmp.c \ + $(srcdir)/bcopy.c $(srcdir)/bsearch.c $(srcdir)/bzero.c \ + $(srcdir)/calloc.c $(srcdir)/choose-temp.c $(srcdir)/clock.c \ + $(srcdir)/concat.c $(srcdir)/cp-demangle.c $(srcdir)/cp-demint.c \ + $(srcdir)/cplus-dem.c $(srcdir)/crc32.c $(srcdir)/dyn-string.c \ + $(srcdir)/fdmatch.c $(srcdir)/ffs.c $(srcdir)/fibheap.c \ + $(srcdir)/filename_cmp.c $(srcdir)/floatformat.c $(srcdir)/fnmatch.c \ + $(srcdir)/fopen_unlocked.c $(srcdir)/getcwd.c $(srcdir)/getopt.c \ + $(srcdir)/getopt1.c $(srcdir)/getpagesize.c $(srcdir)/getpwd.c \ + $(srcdir)/getruntime.c $(srcdir)/gettimeofday.c $(srcdir)/hashtab.c \ + $(srcdir)/hex.c $(srcdir)/index.c $(srcdir)/insque.c \ + $(srcdir)/lbasename.c $(srcdir)/lrealpath.c \ + $(srcdir)/make-relative-prefix.c $(srcdir)/make-temp-file.c \ + $(srcdir)/md5.c $(srcdir)/memchr.c $(srcdir)/memcmp.c \ + $(srcdir)/memcpy.c $(srcdir)/memmem.c $(srcdir)/memmove.c \ + $(srcdir)/mempcpy.c $(srcdir)/memset.c $(srcdir)/mkstemps.c \ + $(srcdir)/objalloc.c $(srcdir)/obstack.c $(srcdir)/partition.c \ + $(srcdir)/pexecute.c $(srcdir)/pex-common.c $(srcdir)/pex-djgpp.c \ + $(srcdir)/pex-msdos.c $(srcdir)/pex-one.c $(srcdir)/pex-unix.c \ + $(srcdir)/pex-win32.c $(srcdir)/physmem.c $(srcdir)/putenv.c \ + $(srcdir)/random.c $(srcdir)/regex.c $(srcdir)/rename.c \ + $(srcdir)/rindex.c $(srcdir)/safe-ctype.c $(srcdir)/setenv.c \ + $(srcdir)/setproctitle.c $(srcdir)/sha1.c $(srcdir)/sigsetmask.c \ + $(srcdir)/snprintf.c $(srcdir)/sort.c $(srcdir)/spaces.c \ + $(srcdir)/splay-tree.c $(srcdir)/stpcpy.c $(srcdir)/stpncpy.c \ + $(srcdir)/strcasecmp.c $(srcdir)/strchr.c $(srcdir)/strdup.c \ + $(srcdir)/strerror.c $(srcdir)/strncasecmp.c $(srcdir)/strncmp.c \ + $(srcdir)/strrchr.c $(srcdir)/strsignal.c $(srcdir)/strstr.c \ + $(srcdir)/strtod.c $(srcdir)/strtol.c $(srcdir)/strtoul.c \ + $(srcdir)/strndup.c $(srcdir)/strverscmp.c $(srcdir)/tmpnam.c \ + $(srcdir)/unlink-if-ordinary.c $(srcdir)/vasprintf.c \ + $(srcdir)/vfork.c $(srcdir)/vfprintf.c $(srcdir)/vprintf.c \ + $(srcdir)/vsnprintf.c $(srcdir)/vsprintf.c $(srcdir)/waitpid.c \ + $(srcdir)/xatexit.c $(srcdir)/xexit.c $(srcdir)/xmalloc.c \ + $(srcdir)/xmemdup.c $(srcdir)/xstrdup.c $(srcdir)/xstrerror.c \ + $(srcdir)/xstrndup.c +DISTFILES += $(srcdir_CFILES) $(srcdir)/cp-demangle.h $(srcdir)/pex-common.h + +# Configuration. +DISTFILES += \ + $(srcdir)/aclocal.m4 \ + $(srcdir)/config.h-vms \ + $(srcdir)/config.in \ + $(srcdir)/config/mh-aix \ + $(srcdir)/config/mh-cxux7 \ + $(srcdir)/config/mh-fbsd21 \ + $(srcdir)/config/mh-openedition \ + $(srcdir)/config/mh-windows \ + $(srcdir)/configure \ + $(srcdir)/configure.ac \ + $(srcdir)/configure.com + +# Construction. +DISTFILES += \ + $(srcdir)/Makefile.in \ + $(srcdir)/local.mk \ + $(srcdir)/makefile.vms \ + $(srcdir)/testsuite/Makefile.in + +# Documentation. +# +# Files listed in TEXIFILES are not prefixed by `$(srcdir)/'; use +# a replacement variable. +srcdir_TEXIFILES = $(srcdir)/fnmatch.txh $(srcdir)/pexecute.txh +DISTFILES += $(TEXISRC) $(srcdir_TEXIFILES) $(srcdir)/at-file.texi + +# Scripts. +DISTFILES += $(srcdir)/maint-tool $(srcdir)/gather-docs + +# Tests. +DISTFILES += \ + $(srcdir)/testsuite/demangle-expected \ + $(srcdir)/testsuite/test-demangle.c \ + $(srcdir)/testsuite/test-expandargv.c \ + $(srcdir)/testsuite/test-pexecute.c + + +# The following recursive targets are missing from Libiberty's +# `Makefile.in'. + +# `Makefile.in' defines `mkdir_p', not `MKDIR_P'. +MKDIR_P = $(mkdir_p) + +# Copied from a `Makefile.in' generated by Automake. +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + +installdirs: # FIXME: Write me. +# Use something like this: +# +# for dir in "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(pythondir)"; do \ +# test -z "$$dir" || $(MKDIR_P) "$$dir"; \ +# done +# +# ? + +install-dvi: # FIXME: Write me. + +uninstall: # FIXME: Write me. + +.PHONY: distdir installdirs install-dvi uninstall + + +# Targets doing nothing. +EMPTY_AUTOMAKE_TARGETS = ps install-ps install-data install-exec ctags +.PHONY: $(EMPTY_AUTOMAKE_TARGETS) +$(EMPTY_AUTOMAKE_TARGETS): -- 1.5.6.5

1 0

last-svn-commit-548-g7d199c0 Add support for configuration option `--with-milena' in Extatica.
by Roland Levillain 09 Nov '10

09 Nov '10

* configure.ac: ...here. Adjust paths accordingly. --- extatica/ChangeLog | 7 +++++++ extatica/configure.ac | 29 ++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index ebffa33..0e17c33 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,12 @@ 2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Add support for configuration option `--with-milena' in Extatica. + + * configure.ac: ...here. + Adjust paths accordingly. + +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix the distribution of Extatica. * config/Makefile.am (ruby.m4): Remove wrong and useless diff --git a/extatica/configure.ac b/extatica/configure.ac index f872d57..a22bf98 100644 --- a/extatica/configure.ac +++ b/extatica/configure.ac @@ -200,8 +200,35 @@ AC_SUBST([DYN_DATADIR], [$my_abs_builddir/data]) AC_SUBST([DYN_FIXTURES], [$my_abs_srcdir/test/fixtures]) +## -------- ## +## Milena. ## +## -------- ## + +# The current approach to providing Extatica a path to Milena's headers +# is naive: for instance, we cannot provide two paths (source and +# build dirs) in the case of an Olena build using a parallel build +# (where srcdir != builddir). Improve if needed. + +# FIXME: Make Milena an optional dependency of Extatica. + +AC_ARG_WITH([milena], + [AC_HELP_STRING([--with-milena=DIR], [path to Milena headers])], + [if test x"$with_milena" = xno; then + AC_MSG_ERROR([Milena is required for Swilena. Try to invoke configure +without `--with-milena=no' nor `--without-milena.']) + fi]) +if test -n "$with_milena" && test x"$with_milena" != xyes; then + MILENA_CPPFLAGS="-I$with_milena" +fi +swl_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$MILENA_CPPFLAGS $CPPFLAGS" +AC_CHECK_HEADER([mln/core/essential.hh], [], + AC_MSG_ERROR([Cannot find Milena's headers. Try to invoke configure with +`--with-milena=DIR'.])) +CPPFLAGS=$swl_save_CPPFLAGS # Absolute path to Milena. -AC_SUBST([MILENA_DIR], [$my_abs_srcdir/../milena]) +MILENA_DIR=`cd "$with_milena" && pwd` +AC_SUBST([MILENA_DIR]) ## ------------------- ## ## Ruby Configuration. ## -- 1.5.6.5

1 0

last-svn-commit-548-g5545f9c Add support for configuration option `--with-milena' in Extatica.
by Roland Levillain 09 Nov '10

09 Nov '10

* configure.ac: ...here. Adjust paths accordingly. --- extatica/ChangeLog | 7 +++++++ extatica/configure.ac | 29 ++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index b313d0a..911ffdf 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,12 @@ 2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Add support for configuration option `--with-milena' in Extatica. + + * configure.ac: ...here. + Adjust paths accordingly. + +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix the distribution of Extatica. * config/Makefile.am (ruby.m4): Remove wrong and useless diff --git a/extatica/configure.ac b/extatica/configure.ac index f872d57..a22bf98 100644 --- a/extatica/configure.ac +++ b/extatica/configure.ac @@ -200,8 +200,35 @@ AC_SUBST([DYN_DATADIR], [$my_abs_builddir/data]) AC_SUBST([DYN_FIXTURES], [$my_abs_srcdir/test/fixtures]) +## -------- ## +## Milena. ## +## -------- ## + +# The current approach to providing Extatica a path to Milena's headers +# is naive: for instance, we cannot provide two paths (source and +# build dirs) in the case of an Olena build using a parallel build +# (where srcdir != builddir). Improve if needed. + +# FIXME: Make Milena an optional dependency of Extatica. + +AC_ARG_WITH([milena], + [AC_HELP_STRING([--with-milena=DIR], [path to Milena headers])], + [if test x"$with_milena" = xno; then + AC_MSG_ERROR([Milena is required for Swilena. Try to invoke configure +without `--with-milena=no' nor `--without-milena.']) + fi]) +if test -n "$with_milena" && test x"$with_milena" != xyes; then + MILENA_CPPFLAGS="-I$with_milena" +fi +swl_save_CPPFLAGS=$CPPFLAGS +CPPFLAGS="$MILENA_CPPFLAGS $CPPFLAGS" +AC_CHECK_HEADER([mln/core/essential.hh], [], + AC_MSG_ERROR([Cannot find Milena's headers. Try to invoke configure with +`--with-milena=DIR'.])) +CPPFLAGS=$swl_save_CPPFLAGS # Absolute path to Milena. -AC_SUBST([MILENA_DIR], [$my_abs_srcdir/../milena]) +MILENA_DIR=`cd "$with_milena" && pwd` +AC_SUBST([MILENA_DIR]) ## ------------------- ## ## Ruby Configuration. ## -- 1.5.6.5

1 0

last-svn-commit-547-geb3778a Fix the distribution of Extatica.
by Roland Levillain 09 Nov '10

09 Nov '10

* config/Makefile.am (ruby.m4): Remove wrong and useless target. (dist_noinst_SCRIPTS): Add erbx rbconfig_gen.rb mk_local_config_rb_in.rb. (EXTRA_DIST): Add xtc.m4. * bin/Makefile.am (noinst_SCRIPTS): Rename as... (dist_noinst_SCRIPTS): ...this, so that scripts are distributed. * src/Makefile.am (libdyn_la_SOURCES): Remove config.h, as it is already distributed as a product of `configure'. Move all_methods.hh, all_methods.cc, function.hh and function.cc... (nodist_libdyn_la_SOURCES): ...here (new variables). (EXTRA_DIST): New variable. (dyn-all.hh, dyn-light.hh): Do not use a pipe to filter concatenated files, to be able to catch errors in the call to `cat' (e.g., missing files). * test/Makefile.am (EXTRA_DIST): Add fixtures/my_lib/lib.hh, fixtures/my_lib/damien.hh and fixtures/my_lib/damien.hxx. --- extatica/ChangeLog | 23 +++++++++++++++++++++++ extatica/bin/Makefile.am | 4 ++-- extatica/config/Makefile.am | 7 +++++-- extatica/src/Makefile.am | 35 +++++++++++++++++++++++++++-------- extatica/test/Makefile.am | 5 +++++ 5 files changed, 62 insertions(+), 12 deletions(-) diff --git a/extatica/ChangeLog b/extatica/ChangeLog index a476bda..ebffa33 100644 --- a/extatica/ChangeLog +++ b/extatica/ChangeLog @@ -1,5 +1,28 @@ 2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix the distribution of Extatica. + + * config/Makefile.am (ruby.m4): Remove wrong and useless + target. + (dist_noinst_SCRIPTS): Add erbx rbconfig_gen.rb + mk_local_config_rb_in.rb. + (EXTRA_DIST): Add xtc.m4. + * bin/Makefile.am (noinst_SCRIPTS): Rename as... + (dist_noinst_SCRIPTS): ...this, so that scripts are distributed. + * src/Makefile.am (libdyn_la_SOURCES): Remove config.h, as it is + already distributed as a product of `configure'. + Move all_methods.hh, all_methods.cc, function.hh and + function.cc... + (nodist_libdyn_la_SOURCES): ...here (new variables). + (EXTRA_DIST): New variable. + (dyn-all.hh, dyn-light.hh): Do not use a pipe to filter + concatenated files, to be able to catch errors in the call to + `cat' (e.g., missing files). + * test/Makefile.am (EXTRA_DIST): Add fixtures/my_lib/lib.hh, + fixtures/my_lib/damien.hh and fixtures/my_lib/damien.hxx. + +2010-11-08 Roland Levillain <roland(a)lrde.epita.fr> + Fix cleaning rules in Extatica. * data/Makefile.am (CLEANFILES): Add Makefile.template and diff --git a/extatica/bin/Makefile.am b/extatica/bin/Makefile.am index 4b0a257..6aa9a50 100644 --- a/extatica/bin/Makefile.am +++ b/extatica/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2005, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -16,5 +16,5 @@ bin_SCRIPTS = dyn-config # FIXME put dyn- before these binaries -noinst_SCRIPTS = mk_swig_input swig_tree_to_yaml yaml_to_dyn_decls +dist_noinst_SCRIPTS = mk_swig_input swig_tree_to_yaml yaml_to_dyn_decls BUILT_SOURCES = dyn-config diff --git a/extatica/config/Makefile.am b/extatica/config/Makefile.am index 5209d05..511ba6b 100644 --- a/extatica/config/Makefile.am +++ b/extatica/config/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2005, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -14,4 +14,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -ruby.m4: rbconfig_gen.rb config/mk_local_config_rb_in.rb +dist_noinst_SCRIPTS = erbx rbconfig_gen.rb mk_local_config_rb_in.rb + +# Used by libiberty/configure.ac. +EXTRA_DIST = xtc.m4 diff --git a/extatica/src/Makefile.am b/extatica/src/Makefile.am index 5f91f40..ab53eb2 100644 --- a/extatica/src/Makefile.am +++ b/extatica/src/Makefile.am @@ -56,13 +56,19 @@ CLEANFILES = \ libdyn_la_SOURCES = \ dyn.hh \ data.hh data.hxx data.cc \ - all_methods.hh all_methods.cc \ - function.hh function.cc \ function_loader.hh function_loader.cc \ name_of.hh name_of.cc \ policy.hh policy.cc \ ruby_stream.hh ruby_stream.cc \ - ansidecl.h demangle.h config.hh + ansidecl.h demangle.h + +nodist_libdyn_la_SOURCES = \ + all_methods.hh all_methods.cc \ + function.hh function.cc + +EXTRA_DIST = \ + all_methods.erb.hh all_methods.erb.cc \ + function.erb.hh function.erb.cc # Provide a dummy `environ' symbol expected by libiberty (from the # MacPorts), but missing on Mac OS X. This is just a workaround. We @@ -102,15 +108,28 @@ cut_local_includes = grep -v '^.[\t ]*include[\t ]*".*"' dyn-all.hh: $(dyn_all_hh_deps) rm -f $@ - echo "// Generated: do not edit by hand!" > $@ - echo "#define DYN_FULL_IMPLEMENTATION" >> $@ - cat $(dyn_all_hh_deps) | $(cut_local_includes) >> $@ + rm -f $@.tmp.1 + rm -f $@.tmp.2 + echo "// Generated by make. Do not edit by hand." >$@.tmp.1 + echo >>$@.tmp.1 + echo "#define DYN_FULL_IMPLEMENTATION" >>$@.tmp.1 + echo >>$@.tmp.1 + cat $(dyn_all_hh_deps) >>$@.tmp.1 + $(cut_local_includes) $@.tmp.1 >>$@.tmp.2 + rm -f $@.tmp.1 + mv $@.tmp.2 $@ chmod -w $@ dyn-light.hh: $(dyn_light_hh_deps) rm -f $@ - echo "// Generated: do not edit by hand!" > $@ - cat $(dyn_light_hh_deps) | $(cut_local_includes) >> $@ + rm -f $@.tmp.1 + rm -f $@.tmp.2 + echo "// Generated by make. Do not edit by hand." >$@.tmp.1 + echo >>$@.tmp.1 + cat $(dyn_light_hh_deps) >>$@.tmp.1 + $(cut_local_includes) $@.tmp.1 >>$@.tmp.2 + rm -f $@.tmp.1 + mv $@.tmp.2 $@ chmod -w $@ %.hh: %.erb.hh diff --git a/extatica/test/Makefile.am b/extatica/test/Makefile.am index a8028d8..3317a26 100644 --- a/extatica/test/Makefile.am +++ b/extatica/test/Makefile.am @@ -75,6 +75,11 @@ milena_test_DEPENDENCIES = $(top_builddir)/src/libdyn.la #erb# =end_generated +# Fixtures. +EXTRA_DIST = \ + fixtures/my_lib/lib.hh \ + fixtures/my_lib/damien.hh fixtures/my_lib/damien.hxx + TESTS = $(check_PROGRAMS) tests: $(check_PROGRAMS) -- 1.5.6.5

1 0