* Makefile.in (bindir, libdir, datadir, mandir, infodir, includedir,
INSTALL_PROGRAM, INSTALL_DATA): Use autoconf-set values.
(docdir): Removed.
* configure.in (AC_PREREQ): autoconf 2.5 or higher.
* doc/Makefile.in (bindir, libdir, datadir, mandir, infodir,
includedir): Use autoconf set values.
(docdir): Removed.
This commit is contained in:
Jason Molenda
parent
f3d564b2dd
commit
1c94de4d74
|
|
@ -1,5 +1,21 @@
|
|||
Mon Jun 24 18:02:50 1996 Jason Molenda (crash@godzilla.cygnus.co.jp)
|
||||
|
||||
* Makefile.in (bindir, libdir, datadir, mandir, infodir, includedir,
|
||||
INSTALL_PROGRAM, INSTALL_DATA): Use autoconf-set values.
|
||||
(docdir): Removed.
|
||||
* configure.in (AC_PREREQ): autoconf 2.5 or higher.
|
||||
* doc/Makefile.in (bindir, libdir, datadir, mandir, infodir,
|
||||
includedir): Use autoconf set values.
|
||||
(docdir): Removed.
|
||||
|
||||
Mon Jun 24 11:58:14 1996 Ian Lance Taylor <ian@cygnus.com>
|
||||
|
||||
* listing.c (listing_eject): Don't do anything if listing is 0.
|
||||
(listing_list): Likewise.
|
||||
(listing_source_line): Likewise.
|
||||
(listing_title): Don't save title if listing is 0.
|
||||
(listing_source_file): Check listing rather than listing_tail.
|
||||
|
||||
* configure.in: On alpha*-*-osf*, link against libbfd.a if not
|
||||
using shared libraries.
|
||||
* configure: Rebuild.
|
||||
|
|
|
|||
|
|
@ -34,12 +34,12 @@ prefix = @prefix@
|
|||
|
||||
program_transform_name = @program_transform_name@
|
||||
exec_prefix = @exec_prefix@
|
||||
bindir = $(exec_prefix)/bin
|
||||
libdir = $(exec_prefix)/lib
|
||||
bindir = @bindir@
|
||||
libdir = @libdir@
|
||||
tooldir = $(exec_prefix)/$(target_alias)
|
||||
|
||||
datadir = $(prefix)/lib
|
||||
mandir = $(prefix)/man
|
||||
datadir = @datadir@
|
||||
mandir = @mandir@
|
||||
man1dir = $(mandir)/man1
|
||||
man2dir = $(mandir)/man2
|
||||
man3dir = $(mandir)/man3
|
||||
|
|
@ -49,17 +49,16 @@ man6dir = $(mandir)/man6
|
|||
man7dir = $(mandir)/man7
|
||||
man8dir = $(mandir)/man8
|
||||
man9dir = $(mandir)/man9
|
||||
infodir = $(prefix)/info
|
||||
includedir = $(prefix)/include
|
||||
docdir = $(datadir)/doc
|
||||
infodir = @infodir@
|
||||
includedir = @includedir@
|
||||
|
||||
VERSION=cygnus-2.6
|
||||
|
||||
SHELL = /bin/sh
|
||||
|
||||
INSTALL = $${srcroot}/install.sh -c
|
||||
INSTALL_PROGRAM = $(INSTALL)
|
||||
INSTALL_DATA = $(INSTALL)
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
|
||||
INSTALL_XFORM1= $(INSTALL_XFORM) -b=.1
|
||||
|
||||
|
|
@ -76,6 +75,7 @@ CC = @CC@
|
|||
CFLAGS = -g
|
||||
LDFLAGS =
|
||||
HLDFLAGS = @HLDFLAGS@
|
||||
RPATH_ENVVAR = @RPATH_ENVVAR@
|
||||
|
||||
MAKEOVERRIDES=
|
||||
|
||||
|
|
@ -302,8 +302,8 @@ check: site.exp
|
|||
cp site.exp testsuite/site.exp
|
||||
rootme=`pwd`; export rootme; \
|
||||
srcdir=`cd ${srcdir}; pwd` ; export srcdir ; \
|
||||
LD_LIBRARY_PATH=$$rootme/../bfd:$$rootme/../opcodes:$$LD_LIBRARY_PATH; \
|
||||
export LD_LIBRARY_PATH; \
|
||||
$(RPATH_ENVVAR)=$$rootme/../bfd:$$rootme/../opcodes:$$$(RPATH_ENVVAR); \
|
||||
export $(RPATH_ENVVAR); \
|
||||
cd testsuite; \
|
||||
EXPECT=${EXPECT} ; export EXPECT ; \
|
||||
if [ -f $${rootme}/../expect/expect ] ; then \
|
||||
|
|
@ -334,32 +334,29 @@ config-stamp: Makefile conf
|
|||
# Compiling object files from source files.
|
||||
|
||||
TARG_CPU_DEP_a29k =
|
||||
TARG_CPU_DEP_alpha = $(srcdir)/config/alpha-opcode.h
|
||||
TARG_CPU_DEP_alpha = $(srcdir)/../include/opcode/alpha.h subsegs.h
|
||||
# start-sanitize-arc
|
||||
TARG_CPU_DEP_arc = $(srcdir)/../include/opcode/arc.h
|
||||
TARG_CPU_DEP_arc = $(srcdir)/../include/opcode/arc.h subsegs.h
|
||||
# end-sanitize-arc
|
||||
TARG_CPU_DEP_arm =
|
||||
TARG_CPU_DEP_arm = subsegs.h
|
||||
TARG_CPU_DEP_generic =
|
||||
TARG_CPU_DEP_h8300 = $(srcdir)/../include/opcode/h8300.h
|
||||
TARG_CPU_DEP_h8500 = $(srcdir)/../opcodes/h8500-opc.h
|
||||
TARG_CPU_DEP_hppa =
|
||||
TARG_CPU_DEP_i386 = $(srcdir)/../include/opcode/i386.h
|
||||
TARG_CPU_DEP_h8500 = $(srcdir)/../opcodes/h8500-opc.h subsegs.h
|
||||
TARG_CPU_DEP_hppa = subsegs.h
|
||||
TARG_CPU_DEP_i386 = $(srcdir)/../include/opcode/i386.h subsegs.h
|
||||
TARG_CPU_DEP_i860 =
|
||||
TARG_CPU_DEP_i960 =
|
||||
TARG_CPU_DEP_m68k = $(srcdir)/../include/opcode/m68k.h \
|
||||
$(srcdir)/config/m68k-parse.h subsegs.h
|
||||
TARG_CPU_DEP_m88k = $(srcdir)/config/m88k-opcode.h
|
||||
TARG_CPU_DEP_mips = $(srcdir)/../include/opcode/mips.h
|
||||
TARG_CPU_DEP_m88k = $(srcdir)/config/m88k-opcode.h subsegs.h
|
||||
TARG_CPU_DEP_mips = $(srcdir)/../include/opcode/mips.h subsegs.h
|
||||
TARG_CPU_DEP_ns32k =
|
||||
TARG_CPU_DEP_ppc =
|
||||
# start-sanitize-rce
|
||||
TARG_CPU_DEP_rce = $(srcdir)/../opcodes/rce-opc.h
|
||||
# end-sanitize-rce
|
||||
TARG_CPU_DEP_sh = $(srcdir)/../opcodes/sh-opc.h
|
||||
TARG_CPU_DEP_sparc =
|
||||
TARG_CPU_DEP_ppc = subsegs.h
|
||||
TARG_CPU_DEP_sh = $(srcdir)/../opcodes/sh-opc.h subsegs.h
|
||||
TARG_CPU_DEP_sparc = subsegs.h
|
||||
TARG_CPU_DEP_tahoe =
|
||||
TARG_CPU_DEP_vax =
|
||||
TARG_CPU_DEP_w65 = $(srcdir)/../opcodes/w65-opc.h
|
||||
TARG_CPU_DEP_w65 = $(srcdir)/../opcodes/w65-opc.h subsegs.h
|
||||
TARG_CPU_DEP_z8k = $(srcdir)/../opcodes/z8k-opc.h
|
||||
|
||||
gasp.o : gasp.c sb.h macro.h config.h
|
||||
|
|
@ -455,13 +452,12 @@ install:
|
|||
srcroot=`cd $(srcroot); pwd`; export srcroot; \
|
||||
$(INSTALL_XFORM) as.new $(bindir)/as; \
|
||||
$(INSTALL_XFORM1) $(srcdir)/doc/as.1 $(man1dir)/as.1; \
|
||||
test -d $(tooldir) || mkdir $(tooldir); \
|
||||
test -d $(tooldir)/bin || mkdir $(tooldir)/bin; \
|
||||
n=`echo as | sed '$(program_transform_name)'`; \
|
||||
if [ -d $(tooldir) ]; then \
|
||||
if [ -d $(tooldir)/bin ] ; then true ; else mkdir $(tooldir)/bin ; fi; \
|
||||
rm -f $(tooldir)/bin/as; \
|
||||
ln $(bindir)/$$n $(tooldir)/bin/as >/dev/null 2>/dev/null \
|
||||
|| $(INSTALL_PROGRAM) as.new $(tooldir)/bin/as; \
|
||||
else true; fi
|
||||
rm -f $(tooldir)/bin/as; \
|
||||
ln $(bindir)/$$n $(tooldir)/bin/as >/dev/null 2>/dev/null \
|
||||
|| $(INSTALL_PROGRAM) as.new $(tooldir)/bin/as
|
||||
srcroot=`cd $(srcroot); pwd`; export srcroot; \
|
||||
$(INSTALL_XFORM) gasp.new $(bindir)/gasp
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ dnl And be careful when changing it! If you must add tests with square
|
|||
dnl brackets, be sure changequote invocations surround it.
|
||||
dnl
|
||||
dnl
|
||||
AC_PREREQ(2.3)dnl We only need 2.0, but pre-2.3 loses on some AIX version.
|
||||
AC_PREREQ(2.5)dnl v2.5 needed for --bindir et al
|
||||
AC_INIT(as.h)dnl
|
||||
dnl
|
||||
user_bfd_gas=
|
||||
|
|
@ -154,6 +154,7 @@ changequote([,])dnl
|
|||
fmt=coff targ=i386coff ;;
|
||||
i386-*-vsta) fmt=aout ;;
|
||||
i386-*-go32) fmt=coff targ=i386coff ;;
|
||||
i386-*-rtems*) fmt=coff targ=i386coff ;;
|
||||
i386-*-gnu*) fmt=elf ;;
|
||||
i386-*-mach*)
|
||||
fmt=aout em=mach bfd_gas=yes ;;
|
||||
|
|
@ -164,6 +165,7 @@ changequote([,])dnl
|
|||
i386-*-*nt) fmt=coff targ=i386coff em=pe ;;
|
||||
i960-*-bout) fmt=bout ;;
|
||||
i960-*-coff) fmt=coff em=ic960 targ=ic960coff ;;
|
||||
i960-*-rtems*) fmt=coff em=ic960 targ=ic960coff ;;
|
||||
i960-*-nindy*) fmt=bout ;;
|
||||
i960-*-vxworks4*) fmt=bout ;;
|
||||
i960-*-vxworks5.0) fmt=bout ;;
|
||||
|
|
@ -177,7 +179,7 @@ changequote([,])dnl
|
|||
m68k-apollo-*) fmt=coff targ=apollo em=apollo ;;
|
||||
m68k-*-sysv4 | m68k-*-elf) # must be before -sysv*
|
||||
fmt=elf ;;
|
||||
m68k-*-coff | m68k-*-sysv*)
|
||||
m68k-*-coff | m68k-*-sysv* | m68k-*-rtems*)
|
||||
fmt=coff targ=m68kcoff ;;
|
||||
m68k-*-hpux*) fmt=hp300 em=hp300 ;;
|
||||
m68k-*-linux*aout*) fmt=aout em=linux ;;
|
||||
|
|
@ -247,6 +249,13 @@ changequote([,])dnl
|
|||
*) targ=ppc-sol ;;
|
||||
esac
|
||||
;;
|
||||
ppc-*-rtems*)
|
||||
fmt=elf
|
||||
case "$endian" in
|
||||
big) targ=ppc-big ;;
|
||||
*) targ=ppc-lit ;;
|
||||
esac
|
||||
;;
|
||||
ppc-*-macos* | ppc-*-mpw*)
|
||||
fmt=coff em=macos ;;
|
||||
ppc-*-netware*) fmt=elf em=ppcnw ;;
|
||||
|
|
@ -256,6 +265,7 @@ changequote([,])dnl
|
|||
ns32k-pc532-mach* | ns32k-pc532-ux*) fmt=aout em=pc532mach ;;
|
||||
ns32k-pc532-netbsd* | ns32k-pc532-lites*) fmt=aout em=nbsd532 ;;
|
||||
|
||||
sparc-*-rtems*) fmt=aout ;;
|
||||
sparc-*-sunos4*) fmt=aout em=sun3 ;;
|
||||
sparc-*-aout | sparc*-*-vxworks*)
|
||||
fmt=aout ;;
|
||||
|
|
@ -528,42 +538,66 @@ esac
|
|||
|
||||
# do we need the opcodes library?
|
||||
case "${need_opcodes}" in
|
||||
yes)
|
||||
OPCODES_DEP=../opcodes/libopcodes.a
|
||||
OPCODES_LIB='-L../opcodes -lopcodes'
|
||||
yes)
|
||||
OPCODES_DEP=../opcodes/libopcodes.a
|
||||
OPCODES_LIB='-L../opcodes -lopcodes'
|
||||
|
||||
# We need to handle some special cases if opcodes was built shared.
|
||||
# We need to handle some special cases for shared libraries.
|
||||
case "${host}" in
|
||||
*-*-sunos*)
|
||||
# On SunOS, we must link against the name we are going to install,
|
||||
# not -lbfd, since SunOS does not support SONAME.
|
||||
if test "${shared_opcodes}" = "true"; then
|
||||
case "${host}" in
|
||||
*-*-sunos*)
|
||||
# On SunOS, we must link against the name we are going to install,
|
||||
# not -lbfd, since SunOS does not support SONAME.
|
||||
OPCODES_LIB='-L../opcodes -l`echo opcodes | sed '"'"'$(program_transform_name)'"'"'`'
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
alpha*-*-osf*)
|
||||
# On Alpha OSF/1, the native linker searches all the -L
|
||||
# directories for any LIB.so files, and only then searches for any
|
||||
# LIB.a files. That means that if there is an installed
|
||||
# libbfd.so, but this build is not done with --enable-shared, the
|
||||
# link will wind up being against the install libbfd.so rather
|
||||
# than the newly built libbfd. To avoid this, we must explicitly
|
||||
# link against libbfd.a when --enable-shared is not used.
|
||||
if test "${shared_opcodes}" != "true"; then
|
||||
OPCODES_LIB='../opcodes/libopcodes.a'
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(OPCODES_DEP)
|
||||
AC_SUBST(OPCODES_LIB)
|
||||
|
||||
case "${need_bfd}" in
|
||||
yes)
|
||||
BFDDEP=../bfd/libbfd.a
|
||||
BFDLIB='-L../bfd -lbfd'
|
||||
ALL_OBJ_DEPS="$ALL_OBJ_DEPS ../bfd/bfd.h"
|
||||
yes)
|
||||
BFDDEP=../bfd/libbfd.a
|
||||
BFDLIB='-L../bfd -lbfd'
|
||||
ALL_OBJ_DEPS="$ALL_OBJ_DEPS ../bfd/bfd.h"
|
||||
|
||||
# We need to handle some special cases if BFD was built shared.
|
||||
# We need to handle some special cases for shared libraries
|
||||
case "${host}" in
|
||||
*-*-sunos*)
|
||||
# On SunOS, we must link against the name we are going to install,
|
||||
# not -lbfd, since SunOS does not support SONAME.
|
||||
if test "${shared_bfd}" = "true"; then
|
||||
case "${host}" in
|
||||
*-*-sunos*)
|
||||
# On SunOS, we must link against the name we are going to install,
|
||||
# not -lbfd, since SunOS does not support SONAME.
|
||||
BFDLIB='-L../bfd -l`echo bfd | sed '"'"'$(program_transform_name)'"'"'`'
|
||||
;;
|
||||
esac
|
||||
BFDLIB='-L../bfd -l`echo bfd | sed '"'"'$(program_transform_name)'"'"'`'
|
||||
fi
|
||||
;;
|
||||
alpha*-*-osf*)
|
||||
# On Alpha OSF/1, the native linker searches all the -L
|
||||
# directories for any LIB.so files, and only then searches for any
|
||||
# LIB.a files. That means that if there is an installed
|
||||
# libbfd.so, but this build is not done with --enable-shared, the
|
||||
# link will wind up being against the install libbfd.so rather
|
||||
# than the newly built libbfd. To avoid this, we must explicitly
|
||||
# link against libbfd.a when --enable-shared is not used.
|
||||
if test "${shared_bfd}" != "true"; then
|
||||
BFDLIB='../bfd/libbfd.a'
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(BFDDEP)
|
||||
AC_SUBST(BFDLIB)
|
||||
|
|
|
|||
Loading…
Reference in New Issue