aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog3
-rw-r--r--gas/Makefile.in30
2 files changed, 16 insertions, 17 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index b027b9d..e5a6f4d 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,8 @@
Wed Jul 5 12:01:49 1995 Ian Lance Taylor <ian@cygnus.com>
+ * Makefile.in: Remove @configure_input@; it's not needed in
+ files named Makefile.
+
* config/tc-m88k.c (md_pseudo_table): Add ".set" so that the
explicit pseudo-op works, while continuing to treat "set" as an
instruction.
diff --git a/gas/Makefile.in b/gas/Makefile.in
index cb3ada6..c93947d 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -1,4 +1,3 @@
-## @configure_input@
# Makefile for GNU Assembler
# Copyright (C) 1987-1992, 1993 Free Software Foundation, Inc.
@@ -192,22 +191,9 @@ OBJS = \
listing.o \
ecoff.o \
stabs.o \
+ @extra_objects@ \
$(TE_OBJS)
-# These are objects we know we'll be pulling in from other directories.
-# For VMS, we have to build them explicitly.
-VMS_OTHER_OBJS = \
- ../libiberty/xmalloc.o \
- ../libiberty/xexit.o \
- ../libiberty/obstack.o \
- ../libiberty/strdup.o \
- ../libiberty/strncasecmp.o \
- ../libiberty/concat.o \
- ../libiberty/getopt.o \
- ../libiberty/getopt1.o \
- ../libiberty/getruntime.o \
- ../libiberty/hex.o
-
all: .gdbinit as.new gasp.new
@srcroot=`cd $(srcroot); pwd`; export srcroot; \
(cd doc ; $(MAKE) $(FLAGS_TO_PASS) all)
@@ -218,7 +204,7 @@ dvi info install-info clean-info:
make-gas.com: stamp-mk.com
stamp-mk.com: vmsconf.sh Makefile
- sh $(srcdir)/vmsconf.sh $(OBJS) $(VMS_OTHER_OBJS) > new-make.com
+ sh $(srcdir)/vmsconf.sh $(OBJS) > new-make.com
$(srcdir)/../move-if-change new-make.com $(srcdir)/make-gas.com
touch stamp-mk.com
@@ -236,7 +222,7 @@ LIBS = @OPCODES_LIB@ @BFDLIB@ $(LOCAL_LOADLIBES) ../libiberty/libiberty.a
# Both . and srcdir are used, in that order,
# so that tm.h and config.h will be found in the compilation
# subdirectory rather than in the source directory.
-INCLUDES = -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(srcdir)/../include -I$(srcdir)/..
+INCLUDES = -I. -I$(srcdir) -I../bfd -I$(srcdir)/config -I$(srcdir)/../include -I$(srcdir)/.. -I$(srcdir)/../bfd
# Always use -I$(srcdir)/config when compiling.
.c.o:
@@ -351,6 +337,16 @@ atof-targ.o : atof-targ.c
obj-format.o : obj-format.c
targ-cpu.o : targ-cpu.c $(TARG_CPU_DEP_@cpu_type@)
+obj-elf.o : $(srcdir)/config/obj-elf.c
+ $(CC) -c $(ALL_CFLAGS) $(CPPFLAGS) $(INCLUDES) $(srcdir)/config/obj-elf.c
+obj-ecoff.o : $(srcdir)/config/obj-ecoff.c
+ $(CC) -c $(ALL_CFLAGS) $(CPPFLAGS) $(INCLUDES) $(srcdir)/config/obj-ecoff.c
+
+e-mipself.o : $(srcdir)/config/e-mipself.c
+ $(CC) -c $(ALL_CFLAGS) $(CPPFLAGS) $(INCLUDES) $(srcdir)/config/e-mipself.c
+e-mipsecoff.o : $(srcdir)/config/e-mipsecoff.c
+ $(CC) -c $(ALL_CFLAGS) $(CPPFLAGS) $(INCLUDES) $(srcdir)/config/e-mipsecoff.c
+
# Remake the info files.
doc: $(srcdir)/as.info