aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>1993-06-29 19:55:24 +0000
committerIan Lance Taylor <ian@airs.com>1993-06-29 19:55:24 +0000
commit9823504d83589903a67f8a81699b03d24a89b95d (patch)
tree6801d11d3d4b6aa79594e8fec42f7eeecbb97110
parenta4374df58dae7a745e5a3cd8ef52418a53693728 (diff)
downloadgdb-9823504d83589903a67f8a81699b03d24a89b95d.zip
gdb-9823504d83589903a67f8a81699b03d24a89b95d.tar.gz
gdb-9823504d83589903a67f8a81699b03d24a89b95d.tar.bz2
* Makefile.in (MAKEINFOFLAGS): New variable.
(FLAGS_TO_PASS): Pass MAKEINFO as MAKEINFO MAKEINFOFLAGS. * build-all.mk, test-build.mk: Pass down --no-split as MAKEINFOFLAGS when hosted on DOS. Compile DOS hosted without -g.
-rw-r--r--ChangeLog11
-rw-r--r--Makefile.in11
-rw-r--r--build-all.mk5
3 files changed, 24 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index db78f1f..b2c849a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue Jun 29 12:50:57 1993 Ian Lance Taylor (ian@cygnus.com)
+
+ * Makefile.in (MAKEINFOFLAGS): New variable.
+ (FLAGS_TO_PASS): Pass MAKEINFO as MAKEINFO MAKEINFOFLAGS.
+ * build-all.mk, test-build.mk: Pass down --no-split as
+ MAKEINFOFLAGS when hosted on DOS. Compile DOS hosted without -g.
+
+Thu Jun 24 13:39:11 1993 Per Bothner (bothner@rtl.cygnus.com)
+
+ * Makefile.in (DEVO_SUPPORT): Add COPYING COPYING.LIB install.sh.
+
Wed Jun 23 12:59:21 1993 Per Bothner (bothner@rtl.cygnus.com)
* Makefile.in (libg++.tar.z): New rule.
diff --git a/Makefile.in b/Makefile.in
index bd78d53..3b0d7bb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -80,6 +80,10 @@ LEX = `if [ -f $${rootme}/flex/flex ] ; \
MAKEINFO = `if [ -f $${rootme}/texinfo/makeinfo/makeinfo ] ; \
then echo $${rootme}/texinfo/makeinfo/makeinfo ; \
else echo makeinfo ; fi`
+# This just becomes part of the MAKEINFO definition passed down to
+# sub-makes. It lets flags be given on the command line while still
+# using the makeinfo from the object tree.
+MAKEINFOFLAGS =
EXPECT = `if [ -f $${rootme}/expect/expect ] ; \
then echo $${rootme}/expect/expect ; \
@@ -223,7 +227,7 @@ BASE_FLAGS_TO_PASS = \
"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
"CXXFLAGS=$(CXXFLAGS)" \
"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
- 'GCC_FOR_TARGET=$$(CC_FOR_TARGET)' \
+ "GCC_FOR_TARGET=$$(CC_FOR_TARGET)" \
"INSTALL=$(INSTALL)" \
"INSTALL_DATA=$(INSTALL_DATA)" \
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
@@ -231,7 +235,7 @@ BASE_FLAGS_TO_PASS = \
"LDFLAGS=$(LDFLAGS)" \
"LEX=$(LEX)" \
"LOADLIBES=$(LOADLIBES)" \
- "MAKEINFO=$(MAKEINFO)" \
+ "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
"MUNCH_NM=$(MUNCH_NM)" \
"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
"PRMS=$(PRMS)" \
@@ -968,7 +972,8 @@ Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
# Build GDB distributions that contain BFD, Include, Libiberty, Readline, etc
DEVO_SUPPORT= README Makefile.in configure configure.in \
- config.guess config.sub config move-if-change
+ config.guess config.sub config move-if-change \
+ COPYING COPYING.LIB install.sh
ETC_SUPPORT= Makefile.in cfg-paper.texi configure.in configure.man \
configure.texi standards.texi make-stds.texi
GDB_SUPPORT_DIRS= bfd include libiberty mmalloc opcodes readline glob sim
diff --git a/build-all.mk b/build-all.mk
index 11c7602..39035cf 100644
--- a/build-all.mk
+++ b/build-all.mk
@@ -21,6 +21,7 @@ NATIVE = native
GCC = gcc -O
CFLAGS = -g
CXXFLAGS = -g -O
+MAKEINFOFLAGS =
log = 1>$(canonhost)-build-log 2>&1
tlog = 1> $(canonhost)-x-$$i-build-log 2>&1
@@ -120,6 +121,9 @@ build := $(shell $(TREE)/config.guess)
endif
CC = i386-go32-gcc
GCC = i386-go32-gcc -O
+CFLAGS =
+CXXFLAGS = -O
+MAKEINFOFLAGS = --no-split
all: all-cross
endif
@@ -129,6 +133,7 @@ FLAGS_TO_PASS := \
"CFLAGS=$(CFLAGS)" \
"CXXFLAGS=$(CXXFLAGS)" \
"host=$(canonhost)" \
+ "MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
"RELEASE_TAG=$(RELEASE_TAG)"
all-emacs: