diff options
Diffstat (limited to 'gcc/ch')
-rw-r--r-- | gcc/ch/ChangeLog | 7 | ||||
-rw-r--r-- | gcc/ch/Makefile.in | 31 | ||||
-rw-r--r-- | gcc/ch/config-lang.in | 3 |
3 files changed, 32 insertions, 9 deletions
diff --git a/gcc/ch/ChangeLog b/gcc/ch/ChangeLog index 708cba3acdb..18e04ff4991 100644 --- a/gcc/ch/ChangeLog +++ b/gcc/ch/ChangeLog @@ -1,3 +1,10 @@ +2000-06-04 Philipp Thomas <pthomas@suse.de> + + * Makefile.in(INTLLIBS): New macro. + (LIBS): Add INTLLIBS. + (DEPLIBS): Likewise. + * config-lang(outputs): Specify ch/Makefile. + Sat Jun 3 15:31:07 2000 Jeffrey A Law (law@cygnus.com) * chill.texi (INFO-DIR-ENTRY): Fix chill entry. diff --git a/gcc/ch/Makefile.in b/gcc/ch/Makefile.in index 7e9e229f769..65a2aa35fc6 100644 --- a/gcc/ch/Makefile.in +++ b/gcc/ch/Makefile.in @@ -54,7 +54,7 @@ T_CFLAGS = X_CPPFLAGS = T_CPPFLAGS = -CC = cc +CC = @CC@ AR = ar AR_FLAGS = rc SHELL = /bin/sh @@ -81,18 +81,25 @@ GCC_CFLAGS=$(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS) program_transform_name = objdir = . -target= ... `configure' substitutes actual target name here. -xmake_file= ... `configure' substitutes actual x- file name here. -tmake_file= ... `configure' substitutes actual t- file name here. +target=@target@ +xmake_file=@dep_host_xmake_file@ +tmake_file=@dep_tmake_file@ #version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < $(srcdir)/version.c` #mainversion=`sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/' < $(srcdir)/version.c` # Directory where sources are, from where we are. -srcdir = . +srcdir = @srcdir@ +VPATH = @srcdir@ # CYGNUS LOCAL # Directory where texinfo.tex lives -texidir = $(srcdir)/../../texinfo +# texidir = $(srcdir)/../../texinfo + +# Top build directory, relative to here. +top_builddir = .. + +# Internationalization library. +INTLLIBS = @INTLLIBS@ # Additional system libraries to link with. CLIB= @@ -111,17 +118,23 @@ all: all.indirect # sed inserts variable overrides after the following line. ####target overrides +@target_overrides@ ####host overrides +@host_overrides@ ####cross overrides +@cross_defines@ +@cross_overrides@ ####build overrides +@build_overrides@ ####site overrides +# @site_overrides@ # # Now figure out from those variables how to compile and link. all.indirect: Makefile ../chill ../cc1chill$(exeext) # IN_GCC tells obstack.h that we are using gcc's <stddef.h> file. -INTERNAL_CFLAGS = $(CROSS) -DIN_GCC +INTERNAL_CFLAGS = $(CROSS) -DIN_GCC @extra_c_flags@ # This is the variable actually used when we compile. ALL_CFLAGS = $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS) $(XCFLAGS) @@ -134,8 +147,8 @@ LIBIBERTY = ../../libiberty/libiberty.a # How to link with both our special library facilities # and the system's installed libraries. -LIBS = $(LIBIBERTY) $(CLIB) -LIBDEPS = $(LIBIBERTY) +LIBS = $(LIBIBERTY) $(CLIB) $(INTLLIBS) +LIBDEPS = $(INTLLIBS) $(LIBIBERTY) # Specify the directories to be searched for header files. # Both . and srcdir are used, in that order, diff --git a/gcc/ch/config-lang.in b/gcc/ch/config-lang.in index 8c9aa95bcaf..1f2ebf68ed3 100644 --- a/gcc/ch/config-lang.in +++ b/gcc/ch/config-lang.in @@ -33,3 +33,6 @@ compilers="cc1chill\$(exeext)" stagestuff="chill chill-cross\$(exeext) cc1chill\$(exeext)" diff_excludes="-x -x ch/chill.info*" + +outputs=ch/Makefile + |