Remove support for the (deprecated) openrisc and or32 configurations and replace

[deliverable/binutils-gdb.git] / gas / Makefile.am

diff --git a/gas/Makefile.am b/gas/Makefile.am
index b85755d3cd05d13eb1f428dee4b66a353ed633b7..01731b9a64dbf92e2131a9e46ca3fff51134151c 100644 (file)
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -1,17 +1,17 @@
 ## Process this file with automake to generate Makefile.in
 #
-#   Copyright 2012 Free Software Foundation
+#   Copyright (C) 2012-2014 Free Software Foundation, Inc.
 #
 # This file 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 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; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
@@ -164,10 +164,10 @@ TARGET_CPU_CFILES = \
        config/tc-moxie.c \
        config/tc-msp430.c \
        config/tc-mt.c \
+       config/tc-nds32.c \
        config/tc-nios2.c \
        config/tc-ns32k.c \
-       config/tc-openrisc.c \
-       config/tc-or32.c \
+       config/tc-or1k.c \
        config/tc-pdp11.c \
        config/tc-pj.c \
        config/tc-ppc.c \
@@ -235,10 +235,10 @@ TARGET_CPU_HFILES = \
        config/tc-mn10300.h \
        config/tc-msp430.h \
        config/tc-mt.h \
+       config/tc-nds32.h \
        config/tc-nios2.h \
        config/tc-ns32k.h \
-       config/tc-openrisc.h \
-       config/tc-or32.h \
+       config/tc-or1k.h \
        config/tc-pdp11.h \
        config/tc-pj.h \
        config/tc-ppc.h \
@@ -600,8 +600,8 @@ install-exec-bindir: $(noinst_PROGRAMS)
        $(mkinstalldirs) $(DESTDIR)$(bindir)
        @list='$(noinst_PROGRAMS)'; for p in $$list; do \
          if test -f $$p; then \
-           echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-           $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+           echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+           $(INSTALL_PROGRAM_ENV) $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
 
@@ -611,7 +611,7 @@ install-exec-tooldir: install-exec-bindir $(noinst_PROGRAMS)
        if [ "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/as$(EXEEXT)" ]; then \
          rm -f $(DESTDIR)$(tooldir)/bin/as$(EXEEXT); \
          ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(tooldir)/bin/as$(EXEEXT) >/dev/null 2>/dev/null \
-           || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) as-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/as$(EXEEXT); \
+           || $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) as-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/as$(EXEEXT); \
        else \
          true ; \
        fi