Revert the last change.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index a2e30980d45b33a5664f15df7dba9266f9432b7a..b7a9eaa99a69557247c6256fc21741c37e47b3b9 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,12 +1,3 @@
-2009-10-03  H.J. Lu  <hongjiu.lu@intel.com>
-
-       * Makefile.am ($(srcdir)/rx-decode.c): Add @MAINT@.
-       (rx-dis.lo): Remove a space.
-       (pc2c$(EXEEXT)): Remove a space. Use $(LINK_FOR_BUILD) instead
-       of gcc.
-       (MAINTAINERCLEANFILES): Add $(srcdir)/rx-decode.c.
-       * Makefile.in: Regenerated.
-
 2009-10-03  Paul Reed  <paulreed@paddedcell.com>
 
        * arm-dis.c (print_insn): Check symtab_size not *symtab.

diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index f16bf4f743f2ca582fc6bd9b2f511e6a06a4655d..735a7ab884db665e7604d8bfe195d96397da8cea 100644 (file)
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -437,13 +437,13 @@ stamp-iq2000: $(CGENDEPS) $(srcdir)/../cpu/iq2000.cpu \
                archfile=$(srcdir)/../cpu/iq2000.cpu \
                opcfile=$(srcdir)/../cpu/iq2000.opc extrafiles=
 
-$(srcdir)/rx-decode.c: @MAINT@ $(srcdir)/rx-decode.opc opc2c$(EXEEXT)
+$(srcdir)/rx-decode.c : $(srcdir)/rx-decode.opc opc2c$(EXEEXT)
        ./opc2c$(EXEEXT) $(srcdir)/rx-decode.opc > $(srcdir)/rx-decode.c
 
-rx-dis.lo: rx-dis.c sysdep.h config.h $(BFD_H) $(INCDIR)/opcode/rx.h
+rx-dis.lo : rx-dis.c sysdep.h config.h $(BFD_H) $(INCDIR)/opcode/rx.h
 
-opc2c$(EXEEXT): $(srcdir)/opc2c.c
-       $(LINK_FOR_BUILD) $(srcdir)/opc2c.c -o opc2c$(EXEEXT)
+opc2c$(EXEEXT) : $(srcdir)/opc2c.c
+       gcc $(srcdir)/opc2c.c -o opc2c$(EXEEXT)
 
 $(srcdir)/xstormy16-desc.h $(srcdir)/xstormy16-desc.c $(srcdir)/xstormy16-opc.h $(srcdir)/xstormy16-opc.c $(srcdir)/xstormy16-ibld.c $(srcdir)/xstormy16-asm.c $(srcdir)/xstormy16-dis.c: $(XSTORMY16_DEPS)
        @true
@@ -461,8 +461,7 @@ MOSTLYCLEANFILES = i386-gen$(EXEEXT_FOR_BUILD) ia64-gen$(EXEEXT_FOR_BUILD) \
        s390-mkopc$(EXEEXT_FOR_BUILD) z8kgen$(EXEEXT_FOR_BUILD)
 
 MAINTAINERCLEANFILES = $(srcdir)/i386-tbl.h $(srcdir)/i386-init.h \
-       $(srcdir)/ia64-asmtab.c $(srcdir)/rx-decode.c s390-opc.tab \
-       $(srcdir)/z8k-opc.h
+       $(srcdir)/ia64-asmtab.c s390-opc.tab $(srcdir)/z8k-opc.h
 
 i386-gen$(EXEEXT_FOR_BUILD): i386-gen.o $(BUILD_LIB_DEPS)
        $(LINK_FOR_BUILD) i386-gen.o $(BUILD_LIBS)

diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index 48eb13cbb1e41408a8de84a867822c82068cf0d4..07c9495fa9581da206e8d4a61c2e7e79d68e8d33 100644 (file)
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -589,8 +589,7 @@ MOSTLYCLEANFILES = i386-gen$(EXEEXT_FOR_BUILD) ia64-gen$(EXEEXT_FOR_BUILD) \
        s390-mkopc$(EXEEXT_FOR_BUILD) z8kgen$(EXEEXT_FOR_BUILD)
 
 MAINTAINERCLEANFILES = $(srcdir)/i386-tbl.h $(srcdir)/i386-init.h \
-       $(srcdir)/ia64-asmtab.c $(srcdir)/rx-decode.c s390-opc.tab \
-       $(srcdir)/z8k-opc.h
+       $(srcdir)/ia64-asmtab.c s390-opc.tab $(srcdir)/z8k-opc.h
 
 
 # Use a helper variable for the dependencies to avoid 'make' issues
@@ -1285,13 +1284,13 @@ stamp-iq2000: $(CGENDEPS) $(srcdir)/../cpu/iq2000.cpu \
                archfile=$(srcdir)/../cpu/iq2000.cpu \
                opcfile=$(srcdir)/../cpu/iq2000.opc extrafiles=
 
-$(srcdir)/rx-decode.c: @MAINT@ $(srcdir)/rx-decode.opc opc2c$(EXEEXT)
+$(srcdir)/rx-decode.c : $(srcdir)/rx-decode.opc opc2c$(EXEEXT)
        ./opc2c$(EXEEXT) $(srcdir)/rx-decode.opc > $(srcdir)/rx-decode.c
 
-rx-dis.lo: rx-dis.c sysdep.h config.h $(BFD_H) $(INCDIR)/opcode/rx.h
+rx-dis.lo : rx-dis.c sysdep.h config.h $(BFD_H) $(INCDIR)/opcode/rx.h
 
-opc2c$(EXEEXT): $(srcdir)/opc2c.c
-       $(LINK_FOR_BUILD) $(srcdir)/opc2c.c -o opc2c$(EXEEXT)
+opc2c$(EXEEXT) : $(srcdir)/opc2c.c
+       gcc $(srcdir)/opc2c.c -o opc2c$(EXEEXT)
 
 $(srcdir)/xstormy16-desc.h $(srcdir)/xstormy16-desc.c $(srcdir)/xstormy16-opc.h $(srcdir)/xstormy16-opc.c $(srcdir)/xstormy16-ibld.c $(srcdir)/xstormy16-asm.c $(srcdir)/xstormy16-dis.c: $(XSTORMY16_DEPS)
        @true