merge binutils and gdb sparc disassemblers

[binutils.git] / binutils / Makefile.in

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index dbe045f1d609f764cb7a652cebf9232a8c98695d..595d64068f98ab54d0d57de6b35c44ae1988d264 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -52,6 +52,7 @@ AR = ar
 AR_FLAGS = qv
 CFLAGS = -g
 MAKEINFO = makeinfo
+TEXI2DVI = texi2dvi
 RANLIB = ranlib
 BISONFLAGS = -d
 TEXI2ROFF=texi2roff
@@ -64,7 +65,7 @@ LEX_OPTIONS = -I -Cem
 LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ; else echo flex ; fi`
 
 # Distribution version
-VERSION=2.0
+VERSION=2.1
 # Distribution name
 DIST_NAME=binutils-${VERSION}
 
@@ -89,7 +90,10 @@ SIZE_PROG=size
 NM_PROG=nm
 OBJDUMP_PROG=objdump
 
-PROGS = $(SIZE_PROG) $(OBJDUMP_PROG) $(NM_PROG) $(AR_PROG) $(STRIP_PROG) $(RANLIB_PROG)
+# This is the demangler, as a standalone program.
+DEMANGLER_PROG=demangle
+
+PROGS = $(SIZE_PROG) $(OBJDUMP_PROG) $(NM_PROG) $(AR_PROG) $(STRIP_PROG) $(RANLIB_PROG) $(DEMANGLER_PROG)
 STAGESTUFF = $(PROGS) *.o
 # Files that can be generated, but should be in the distribution.
 DISTSTUFF=arparse.c arlex.c binutils.mm
@@ -108,7 +112,7 @@ INCLUDES = -I. -I$(srcdir) -I$(BASEDIR)/include -I$(BASEDIR)/bfd
 
 # When adding .o files, to make VPATH work in Sun Make, you have to
 # also add a foo.o: foo.c line at the bottom of the file.
-DISASMS = m68k-pinsn.o i960-pinsn.o i386-pinsn.o sparc-pinsn.o  am29k-pinsn.o
+DISASMS = i960-pinsn.o am29k-pinsn.o
 
 #\f
 ## Random definitions
@@ -126,7 +130,9 @@ DISASMS = m68k-pinsn.o i960-pinsn.o i386-pinsn.o sparc-pinsn.o  am29k-pinsn.o
 # Use the GNU getopt unless you have problems with it.
 # The IRIS version could probably benefit from being assembled with
 # libmalloc rather than the ordinary malloc.
-LIBIBERTY = ./../libiberty/libiberty.a
+LIBIBERTY_SRC_DIR = $(srcdir)/../libiberty
+LIBIBERTY_BIN_DIR = ./../libiberty
+LIBIBERTY = $(LIBIBERTY_BIN_DIR)/libiberty.a
 
 # Code shared by all the binutils.
 BULIBS = bucomm.o version.o filemode.o
@@ -138,16 +144,25 @@ OPCODES = $(OPCODEDIR)/libopcodes.a
 #\f
 ## The rules
 
-all: $(ADDL_LIBS) $(PROGS)
+all: $(ADDL_LIBS) $(PROGS) testsuite
+
+testsuite:
+       if [ -d testsuite ]; then \
+                       (rootme=`pwd`/ ; export rootme ; \
+                        rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \
+                        cd testsuite; $(MAKE) $(FLAGS_TO_PASS)); \
+       else true ; fi
 
-check:
+check: all
        /bin/sh $(srcdir)/sanity.sh .
 
-test-install:
+installcheck:
        /bin/sh $(srcdir)/sanity.sh $(bindir)
 
 info: binutils.info
 
+dvi: binutils.dvi
+
 #$(BFD):$(LIBDIR)/../common/*.c
 #      (cd $(LIBDIR); make)
 
@@ -164,7 +179,10 @@ $(NM_PROG): $(ADDL_LIBS) nm.o $(BFD)
        $(CC) $(LDFLAGS) $(CFLAGS) -o $(NM_PROG) nm.o $(ADDL_LIBS) $(LOADLIBES)
 
 $(OBJDUMP_PROG): $(ADDL_LIBS) size.o objdump.o $(DISASMS) $(BFD) $(OPCODES)
-       $(CC) $(LDFLAGS) $(CFLAGS) -o $(OBJDUMP_PROG) objdump.o $(DISASMS) $(ADDL_LIBS) $(OPCODES) $(LOADLIBES)
+       $(CC) $(LDFLAGS) $(CFLAGS) -o $(OBJDUMP_PROG) objdump.o $(DISASMS) $(OPCODES) $(ADDL_LIBS) $(LOADLIBES)
+
+$(DEMANGLER_PROG): $(LIBIBERTY_SRC_DIR)/cplus-dem.c
+       $(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) $(HDEFINES) $(TDEFINES) -DMAIN -o $(DEMANGLER_PROG) $(LIBIBERTY_SRC_DIR)/cplus-dem.c $(LIBIBERTY) $(LOADLIBES)
 
 arparse.c:arparse.y
        $(BISON) $(BISONFLAGS)  $(srcdir)/arparse.y
@@ -234,9 +252,7 @@ de-stage3: force
 # DOCUMENTATION TARGETS
 # TeX output
 binutils.dvi: $(srcdir)/binutils.texi
-       TEXINPUTS=${TEXIDIR}:.:$$TEXINPUTS tex $(srcdir)/binutils.texi
-       texindex binutils.??
-       TEXINPUTS=${TEXIDIR}:.:$$TEXINPUTS tex $(srcdir)/binutils.texi
+       $(TEXI2DVI) $(srcdir)/binutils.texi
 
 # info file for online browsing
 binutils.info: $(srcdir)/binutils.texi
@@ -309,7 +325,7 @@ mostlyclean:
 clean: mostlyclean
        -rm -f $(PROGS)
 distclean: clean
-       -rm -f Makefile config.status
+       -rm -f Makefile config.status sysdep.h
 realclean: distclean
        -rm -f $(DISTSTUFF) TAGS
 
@@ -352,8 +368,8 @@ clean-info:
        -rm -rf *.info*
 
 # Making a dist:
-# cvs rtag binutils-x-yy binutils
-# cvs co -r binutils-x-yy binutils
+# cvs rtag binutils-x-yy ld+utils
+# cvs co -r binutils-x-yy ld+utils
 # Sanitize
 # cd {HERE}; make dist [-f Makefile.in]
 
@@ -362,11 +378,15 @@ dist: $(DIST_NAME).tar.Z
 diststuff: $(DISTSTUFF)
 
 $(DIST_NAME).tar.Z:
-       cd ..; chmod og=u `find . -print`
        cd ../..; rm -f $(DIST_NAME); ln -s devo $(DIST_NAME)
        make diststuff -f Makefile.in
        cd ../ld; make diststuff -f Makefile.in
        cd ../gprof; make diststuff -f Makefile.in
+       cd ../texinfo; mv texinfo.tex ..; rm -rf *; mv ../texinfo.tex .
+       # Take out texinfo from configurable dirs
+       mv ../configure.in tmp; \
+         sed -e '/^host_tools=/s/texinfo //' <tmp >../configure.in; rm tmp
+       cd ..; chmod og=u `find . -print`
        cd ../..; tar chf - $(DIST_NAME) | compress >$(DIST_NAME).tar.Z
        rm -rf ../../$(DIST_NAME)
 
@@ -384,7 +404,6 @@ gmalloc.o:gmalloc.c
 i960-pinsn.o: i960-pinsn.c
 is-ranlib.o:is-ranlib.c
 is-strip.o:is-strip.c
-m68k-pinsn.o: m68k-pinsn.c
 maybe-ranlib.o:maybe-ranlib.c
 maybe-strip.o:maybe-strip.c
 nm.o: nm.c
@@ -392,8 +411,6 @@ not-ranlib.o:not-ranlib.c
 not-strip.o:not-strip.c
 objdump.o: objdump.c
 size.o: size.c
-sparc-pinsn.o: sparc-pinsn.c
-i386-pinsn.o: i386-pinsn.c
 strip.o:strip.c
 version.o: $(srcdir)/version.c
        $(CC) $(CFLAGS) $(INCLUDES) $(HDEFINES) $(TDEFINES) -DVERSION='"$(VERSION)"' -c $(srcdir)/version.c