* Makefile.in: Make everything which depends upon all-bfd also

depend upon all-opcodes, in case --with-commonbfdlib is used.
This commit is contained in:
Ian Lance Taylor 1996-02-19 16:46:39 +00:00
parent c653b37092
commit b6ae0f1031
2 changed files with 57 additions and 10 deletions

View File

@ -1,3 +1,8 @@
Mon Feb 19 11:45:30 1996 Ian Lance Taylor <ian@cygnus.com>
* Makefile.in: Make everything which depends upon all-bfd also
depend upon all-opcodes, in case --with-commonbfdlib is used.
Thu Feb 15 19:50:50 1996 Michael Meissner <meissner@tiktok.cygnus.com>
* configure.in (host *-*-cygwin32): Don't build gdb if we are

View File

@ -86,6 +86,9 @@ CXXFLAGS_FOR_TARGET = $(CXXFLAGS)
LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
RANLIB = ranlib
DLLTOOL = dlltool
NM = nm
# Not plain GZIP, since gzip looks there for extra command-line options.
GZIPPROG = gzip
@ -140,6 +143,19 @@ TARGET_SUBDIR = . # Changed by configure to $(target_alias) if cross.
# This is set by the configure script to the arguments passed to configure.
CONFIG_ARGUMENTS =
# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared
# was used.
SET_LIB_PATH =
# This is the name of the environment variable used for the path to
# the libraries. This may be changed by configure.in.
RPATH_ENVVAR = LD_LIBRARY_PATH
# configure.in sets SET_LIB_PATH to this if --enable-shared was used.
REALLY_SET_LIB_PATH = \
$(RPATH_ENVVAR)=$$r/bfd:$$r/opcodes:$$$(RPATH_ENVVAR); \
export $(RPATH_ENVVAR);
ALL = all.normal
INSTALL_TARGET = install-dirs \
$(INSTALL_MODULES) \
@ -318,8 +334,10 @@ EXTRA_HOST_FLAGS = \
'AS=$(AS)' \
'CC=$(CC)' \
'CXX=$(CXX)' \
'DLLTOOL=$(DLLTOOL)' \
'NM=$(NM)' \
'RANLIB=$(RANLIB)'
'RANLIB=$(RANLIB)'
FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
@ -367,6 +385,7 @@ EXTRA_GCC_FLAGS = \
'AS=$(AS)' \
'CC=$(CC)' \
'CXX=$(CXX)' \
'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
'HOST_CC=$(CC_FOR_BUILD)' \
'HOST_PREFIX=$(HOST_PREFIX)' \
'HOST_PREFIX_1=$(HOST_PREFIX_1)' \
@ -649,6 +668,7 @@ $(DO_X):
@target=`echo $@ | sed -e 's/^do-//'`; \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
for i in $(SUBDIRS) -dummy-; do \
if [ -f ./$$i/Makefile ]; then \
case $$i in \
@ -663,11 +683,12 @@ $(DO_X):
done; \
;; \
esac ; \
export AR AS CC CXX NM RANLIB; \
export AR AS CC CXX NM RANLIB DLLTOOL; \
if (cd ./$$i; \
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \
"DLLTOOL=$${DLLTOOL}" \
$${target}); \
then true; else exit 1; fi; \
else true; fi; \
@ -675,16 +696,18 @@ $(DO_X):
@target=`echo $@ | sed -e 's/^do-//'`; \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
for i in $(TARGET_CONFIGDIRS) -dummy-; do \
if [ -f $(TARGET_SUBDIR)/$$i/Makefile ]; then \
for flag in $(EXTRA_TARGET_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\(.*\)=\(.*\)|\1='\2'|"`; \
done; \
export AR AS CC CXX NM RANLIB; \
export AR AS CC CXX NM RANLIB DLLTOOL; \
if (cd $(TARGET_SUBDIR)/$$i; \
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \
"DLLTOOL=$${DLLTOOL}" \
$${target}); \
then true; else exit 1; fi; \
else true; fi; \
@ -760,6 +783,7 @@ vault-install:
install.all: install-no-fixedincludes
@if [ -f ./gcc/Makefile ] ; then \
r=`pwd` ; export r ; \
$(SET_LIB_PATH) \
(cd ./gcc; \
$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
else \
@ -790,6 +814,7 @@ gcc-no-fixedincludes:
rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd` ; export srcroot; \
$(SET_LIB_PATH) \
(cd ./gcc; \
$(MAKE) $(GCC_FLAGS_TO_PASS) install); \
rm -rf gcc/include; \
@ -808,6 +833,7 @@ $(ALL_MODULES) all-gui all-libproc:
if [ -f ./$${dir}/Makefile ] ; then \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
(cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) all); \
else \
true; \
@ -824,6 +850,7 @@ $(NATIVE_CHECK_MODULES):
if [ -f ./$${dir}/Makefile ] ; then \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
(cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
else \
true; \
@ -835,6 +862,7 @@ $(CROSS_CHECK_MODULES):
if [ -f ./$${dir}/Makefile ] ; then \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
(cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) check); \
else \
true; \
@ -848,6 +876,7 @@ $(INSTALL_MODULES): install-dirs
if [ -f ./$${dir}/Makefile ] ; then \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
(cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \
else \
true; \
@ -865,12 +894,14 @@ $(CONFIGURE_TARGET_MODULES):
[ -d $(TARGET_SUBDIR)/$${dir} ] || mkdir $(TARGET_SUBDIR)/$${dir};\
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
AR="$(AR_FOR_TARGET)"; export AR; \
AS="$(AS_FOR_TARGET)"; export AS; \
CC="$(CC_FOR_TARGET)"; export CC; \
CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
CXX="$(CXX_FOR_TARGET)"; export CXX; \
CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
LD="$(LD_FOR_TARGET)"; export LD; \
NM="$(NM_FOR_TARGET)"; export NM; \
RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
@ -925,6 +956,7 @@ $(ALL_TARGET_MODULES):
if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
(cd $(TARGET_SUBDIR)/$${dir}; $(MAKE) $(TARGET_FLAGS_TO_PASS) all); \
else \
true; \
@ -938,6 +970,7 @@ $(CHECK_TARGET_MODULES):
if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
(cd $(TARGET_SUBDIR)/$${dir};$(MAKE) $(TARGET_FLAGS_TO_PASS) check);\
else \
true; \
@ -952,6 +985,7 @@ $(INSTALL_TARGET_MODULES): install-dirs
if [ -f $(TARGET_SUBDIR)/$${dir}/Makefile ] ; then \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
(cd $(TARGET_SUBDIR)/$${dir}; \
$(MAKE) $(TARGET_FLAGS_TO_PASS) install); \
else \
@ -966,6 +1000,7 @@ $(ALL_X11_MODULES):
if [ -f ./$${dir}/Makefile ] ; then \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
(cd $${dir}; \
$(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all); \
else \
@ -980,6 +1015,7 @@ $(CHECK_X11_MODULES):
if [ -f ./$${dir}/Makefile ] ; then \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
(cd $${dir}; \
$(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check); \
else \
@ -994,6 +1030,7 @@ $(INSTALL_X11_MODULES):
if [ -f ./$${dir}/Makefile ] ; then \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
(cd $${dir}; \
$(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install); \
else \
@ -1006,6 +1043,7 @@ all-gcc:
@if [ -f ./gcc/Makefile ] ; then \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
(cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) all); \
else \
true; \
@ -1016,6 +1054,7 @@ all-bootstrap:
@if [ -f ./gcc/Makefile ] ; then \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
(cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) bootstrap); \
else \
true; \
@ -1026,6 +1065,7 @@ check-gcc:
@if [ -f ./gcc/Makefile ] ; then \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
(cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check); \
else \
true; \
@ -1036,6 +1076,7 @@ install-gcc:
@if [ -f ./gcc/Makefile ] ; then \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
(cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
else \
true; \
@ -1051,6 +1092,7 @@ install-dosrel: install-dirs info
if [ -f ./$${dir}/Makefile ] ; then \
r=`pwd`; export r; \
srcroot=`cd $(srcdir); pwd`; export srcroot; \
$(SET_LIB_PATH) \
(cd $${dir}; $(MAKE) $(FLAGS_TO_PASS) install); \
else \
true; \
@ -1084,15 +1126,15 @@ all-gcc: all-libiberty all-byacc all-binutils all-gas all-ld
all-bootstrap: all-libiberty all-byacc all-binutils all-gas all-ld
GDB_TK = all-tk all-tcl
all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
all-gprof: all-libiberty all-bfd
all-gprof: all-libiberty all-bfd all-opcodes
all-grep: all-libiberty
all-grez: all-libiberty all-bfd
all-grez: all-libiberty all-bfd all-opcodes
all-gui: all-gdb all-libproc all-target-librx
all-gzip: all-libiberty
all-hello: all-libiberty
all-indent:
all-ispell: all-emacs19
all-ld: all-libiberty all-bfd all-byacc all-flex
all-ld: all-libiberty all-bfd all-opcodes all-byacc all-flex
configure-target-libg++: $(ALL_GCC) configure-target-librx
all-target-libg++: configure-target-libg++ all-gas all-ld all-gcc all-target-libiberty all-target-newlib all-target-libio all-target-librx all-target-libstdc++
configure-target-libgloss: $(ALL_GCC)
@ -1109,7 +1151,7 @@ all-make: all-libiberty
all-mmalloc:
configure-target-newlib: $(ALL_GCC)
all-target-newlib: configure-target-newlib all-binutils all-gas all-gcc
all-opcodes: all-bfd
all-opcodes: all-bfd all-libiberty
all-patch: all-libiberty
all-prms: all-libiberty
all-rcs:
@ -1118,17 +1160,17 @@ all-recode: all-libiberty
all-sed: all-libiberty
all-send-pr: all-prms
all-shellutils:
all-sim: all-libiberty all-bfd
all-sim: all-libiberty all-bfd all-opcodes
all-tar: all-libiberty
all-tcl:
all-tclX: all-tcl all-tk
all-tk: all-tcl
all-texinfo: all-libiberty
all-textutils:
all-tgas: all-libiberty all-bfd
all-tgas: all-libiberty all-bfd all-opcodes
all-time:
all-wdiff:
all-target-winsup: all-target-newlib configure-target-winsup
all-target-winsup: all-target-newlib all-target-libiberty configure-target-winsup
configure-target-winsup: configure-target-newlib
all-uudecode: all-libiberty
configure-target-libiberty: $(ALL_GCC)