diff options
author | Ian Lance Taylor <ian@airs.com> | 1992-08-18 21:24:59 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@airs.com> | 1992-08-18 21:24:59 +0000 |
commit | 4b857710641cfe0572abf21a7a3345e0975a716d (patch) | |
tree | 4092c7de57f1f21b18e045d888631ffcbf52e21a /gas | |
parent | 6f28dd0bca730aaaf5276dde77ad38881cc39a61 (diff) | |
download | gdb-4b857710641cfe0572abf21a7a3345e0975a716d.zip gdb-4b857710641cfe0572abf21a7a3345e0975a716d.tar.gz gdb-4b857710641cfe0572abf21a7a3345e0975a716d.tar.bz2 |
Moved in from p3:
Tue Aug 18 14:16:38 1992 Ian Lance Taylor (ian@cygnus.com)
* Makefile.in: always create installation directories. Removed
MINUS_G, set CFLAGS to default to -g, added FLAGS_TO_PASS, passed
FLAGS_TO_PASS to recursive makes.
Diffstat (limited to 'gas')
-rw-r--r-- | gas/ChangeLog | 6 | ||||
-rw-r--r-- | gas/Makefile.in | 60 | ||||
-rw-r--r-- | gas/configure.in | 6 |
3 files changed, 50 insertions, 22 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index ad6a125..e781d0d 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +Tue Aug 18 14:16:38 1992 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in: always create installation directories. Removed + MINUS_G, set CFLAGS to default to -g, added FLAGS_TO_PASS, passed + FLAGS_TO_PASS to recursive makes. + Mon Aug 17 15:09:56 1992 Steve Chamberlain (sac@thepub.cygnus.com) * input-scrub.c (input_scrub_pop, input_scrub_push): memcpy was diff --git a/gas/Makefile.in b/gas/Makefile.in index 145a015..de01691 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -29,6 +29,7 @@ srcdir = . prefix = /usr/local program_prefix = +program_suffix = exec_prefix = $(prefix) bindir = $(exec_prefix)/bin libdir = $(exec_prefix)/lib @@ -60,7 +61,25 @@ AR_FLAGS = qv BISON = bison MAKEINFO = makeinfo RANLIB = ranlib -MINUS_G = -g +CFLAGS = -g + +FLAGS_TO_PASS = \ + "prefix=$(prefix)" \ + "exec_prefix=$(exec_prefix)" \ + "tooldir=$(tooldir)" \ + "AR=$(AR)" \ + "AR_FLAGS=$(AR_FLAGS)" \ + "CC=$(CC)" \ + "CFLAGS=$(CFLAGS)" \ + "RANLIB=$(RANLIB)" \ + "LOADLIBES=$(LOADLIBES)" \ + "LDFLAGS=$(LDFLAGS)" \ + "BISON=$(BISON)" \ + "LEX=$(LEX)" \ + "MAKEINFO=$(MAKEINFO)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" # Lists of files for various purposes. @@ -165,26 +184,26 @@ OBJS = \ #### host, target, and site specific Makefile frags come in here. all: as.new - @(cd doc ; $(MAKE) all) + @(cd doc ; $(MAKE) $(FLAGS_TO_PASS) all) info: - @(cd doc ; $(MAKE) info "MAKEINFO=$(MAKEINFO)") + @(cd doc ; $(MAKE) $(FLAGS_TO_PASS) info) install-info: - @(cd doc ; $(MAKE) install-info) + @(cd doc ; $(MAKE) $(FLAGS_TO_PASS) install-info) clean-info: - @(cd doc ; $(MAKE) clean-info) + @(cd doc ; $(MAKE) $(FLAGS_TO_PASS) clean-info) # Now figure out from those variables how to compile and link. # This is the variable actually used when we compile. -ALL_CFLAGS = $(MINUS_G) $(INTERNAL_CFLAGS) $(CROSS) $(CFLAGS) $(HDEFINES) $(TDEFINES) +ALL_CFLAGS = $(INTERNAL_CFLAGS) $(CROSS) $(CFLAGS) $(HDEFINES) $(TDEFINES) # How to link with both our special library facilities # and the system's installed libraries. -LIBS = $(LOCAL_LOADLIBES) $(CLIB) # ../libiberty/libiberty.a +LIBS = $(LOCAL_LOADLIBES) $(CLIB) ../libiberty/libiberty.a # Specify the directories to be searched for header files. # Both . and srcdir are used, in that order, @@ -313,10 +332,10 @@ targ-cpu.o : targ-cpu.c targ-env.h obj-format.h \ doc: $(srcdir)/as.info $(srcdir)/as.info: $(srcdir)/doc/as.texinfo - @(cd doc; make as.info; mv as.info $srcdir) + @(cd doc; make $(FLAGS_TO_PASS) as.info; mv as.info $srcdir) clean: - @(cd doc ; $(MAKE) clean) + @(cd doc ; $(MAKE) $(FLAGS_TO_PASS) clean) -rm -f $(STAGESTUFF) core # Like clean but also delete the links made to configure gas. @@ -331,19 +350,18 @@ distclean: clean # Copy the files into directories where they will be run. install: - -rm -f $(bindir)/$(program_prefix)as - $(INSTALL_PROGRAM) as.new $(bindir)/$(program_prefix)as + -parent=`echo $(bindir)|sed -e 's@/[^/]*$$@@'`; \ + if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi + -if [ -d $(bindir) ] ; then true ; else mkdir $(bindir) ; fi + -parent=`echo $(man1dir)|sed -e 's@/[^/]*$$@@'`; \ + if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi + -if [ -d $(man1dir) ] ; then true ; else mkdir $(man1dir) ; fi + -rm -f $(bindir)/$(program_prefix)as$(program_suffix) + $(INSTALL_PROGRAM) as.new $(bindir)/$(program_prefix)as$(program_suffix) -rm -f $(tooldir)/as - ln $(bindir)/$(program_prefix)as $(tooldir)/as - -rm -f $(man1dir)/$(program_prefix)as.1 - $(INSTALL_DATA) $(srcdir)/doc/as.1 $(man1dir)/$(program_prefix)as.1 - -# Create the installation directory. -install-dir: - -mkdir $(libdir) - -mkdir $(libdir)/gcc - -mkdir $(libdir)/gcc/$(target) - -mkdir $(libdir)/gcc/$(target)/$(version) + ln $(bindir)/$(program_prefix)as$(program_suffix) $(tooldir)/as + -rm -f $(man1dir)/$(program_prefix)as$(program_suffix).1 + $(INSTALL_DATA) $(srcdir)/doc/as.1 $(man1dir)/$(program_prefix)as$(program_suffix).1 # Cancel installation by deleting the installed files. uninstall: diff --git a/gas/configure.in b/gas/configure.in index dc94cc9..b92296d 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -133,7 +133,7 @@ coff* | sysv*) vxworks) case ${target_cpu} in i960) obj_format=bout ;; - m68k|m680[01234]0) + m68k|m680[01234]0|m683?2) obj_format=aout emulation=sun3 ;; @@ -144,6 +144,9 @@ OSE) obj_format=aout emulation=sun3 ;; +aout) + obj_format=aout + ;; *) case ${target_vendor} in aout) obj_format=aout ;; @@ -171,6 +174,7 @@ esac case ${target_cpu} in sparclite) cpu_type=sparc ;; m680[01234]0) cpu_type=m68k ;; +m683?2) cpu_type=m68k ;; esac # and target makefile frag |