X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fcommon%2FMakefile.in;h=f713fcaa35b8e5c2a50942a8241a00fda08965b9;hb=a435742a7fb32f6320ce0e6074e2500e28378104;hp=dd7c5e0e9ec9b97074802baf42270b8489c33f6e;hpb=5b64ad42d36e6d487e1f7287d37fbc243a178e72;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/common/Makefile.in b/sim/common/Makefile.in
index dd7c5e0e9e..f713fcaa35 100644
--- a/sim/common/Makefile.in
+++ b/sim/common/Makefile.in
@@ -1,25 +1,25 @@
 #    Makefile template for Configure for simulator common directory
-#    Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+#    Copyright (C) 1996-2020 Free Software Foundation, Inc.
 # 
 # This program 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; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 default: all
 
 VPATH = @srcdir@
 srcdir = @srcdir@
-srcroot = $(srcdir)/../..
+abs_srcdir = @abs_srcdir@
+srcroot = $(abs_srcdir)/../..
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -32,6 +32,7 @@ bindir = @bindir@
 libdir = @libdir@
 tooldir = $(libdir)/$(target_alias)
 
+datarootdir = @datarootdir@
 datadir = @datadir@
 mandir = @mandir@
 man1dir = $(mandir)/man1
@@ -47,7 +48,6 @@ INSTALL_DATA = @INSTALL_DATA@
 CC = @CC@
 CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
-SIM_CFLAGS = @sim_cflags@
 
 # These are used to rebuild nltvals.def.
 CPP_FOR_TARGET = @CPP_FOR_TARGET@
@@ -56,7 +56,7 @@ TARGET_SUBDIR = @TARGET_SUBDIR@
 HDEFINES = @HDEFINES@
 TDEFINES =
 
-CONFIG_CFLAGS = @DEFS@ $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES)
+CONFIG_CFLAGS = @DEFS@ $(HDEFINES) $(TDEFINES)
 CSEARCH = -I. -I$(srcdir) -I$(srcroot)/include
 ALL_CFLAGS = $(CFLAGS) $(CONFIG_CFLAGS) $(CSEARCH)
 BUILD_CFLAGS = -g -O $(CSEARCH)
@@ -71,21 +71,18 @@ MAKEOVERRIDES=
 
 all:
 
-# Generate TARG_VALS_H for newlib/libgloss using devo and build tree.
+# Generate nltvals.def for newlib/libgloss using devo and build tree.
 # This file is shipped with distributions so we build in the source dir.
-# This is built in srcdir so putting dependencies here is risky.
 # Use `make headers' to rebuild.
-headers: nltvals.def
+# Note: If gdb releases begin to contain target header files (not a good idea,
+# but if they did ...), nltvals.def coud be generated at build time.
+# An alternative is to slurp in the tables at runtime.
 .PHONY: headers
-
-# Note: If gdb releases begin to contain target header files, generate
-# targ-vals.def at build time.
-
-nltvals.def: Makefile gennltvals.sh gentvals.sh
+headers:
 	rootme=`pwd` ; \
 	cd $(srcdir) ; \
 	rm -f nltvals.new ; \
-	$(SHELL) $(srcdir)/gennltvals.sh $(SHELL) $(srcroot) "$(CPP_FOR_TARGET)" > nltvals.new ; \
+	$(SHELL) $(abs_srcdir)/gennltvals.sh $(SHELL) $(srcroot) "$(CPP_FOR_TARGET)" > nltvals.new ; \
 	$(SHELL) $(srcroot)/move-if-change nltvals.new nltvals.def
 
 .c.o:
@@ -103,30 +100,29 @@ tags etags: TAGS
 # And the sim-n-foo.h files create functions that can't be found either.
 TAGS: force
 	cd $(srcdir) && \
-	etags --regex '/^\([a-z_]+\) (/\1/' --regex '/^\/[*] TAGS: .*/' \
-		*.[ch]
+	etags --regex '/^\([a-z_]+\) (/\1/' --regex '/^.*\/[*] TAGS: .*/' \
+		*.c *.h
 
 clean:
 	rm -f *.[oa] *~ core
-	rm -f $(ALL)
 
 distclean mostlyclean maintainer-clean realclean: clean
 	rm -f TAGS
 	rm -f Makefile config.cache config.log config.status
-	rm -f config.h stamp-h
 
 # Dummy target to force execution of dependent targets.
 force:
 
 # Copy the files into directories where they will be run.
-install:
+install: install-man
+install-strip: install-man
 
 install-man: installdirs
 	n=`echo run | sed '$(program_transform_name)'`; \
-	$(INSTALL_DATA) $(srcdir)/run.1 $(man1dir)/$$n.1
+	$(INSTALL_DATA) $(srcdir)/run.1 $(DESTDIR)$(man1dir)/$$n.1
 
 installdirs:
-	$(SHELL) $(srcdir)/../../mkinstalldirs $(man1dir)
+	$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(man1dir)
 
 Makefile: Makefile.in config.status
 	$(SHELL) ./config.status