From a3db1269c56081c0e788dce849b0de0cc51387a3 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Wed, 3 Jul 2002 19:03:59 +0000 Subject: merge with tot. --- sim/ppc/ChangeLog | 7 +++++++ sim/ppc/Makefile.in | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index 6ced05bc37f..4c2dfef8181 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,10 @@ +2002-06-22 Andrew Cagney + + * Makefile.in (INTL_SRC): Define. + (INTL_CFLAGS): Define. + (INTL_DIR): Define. + (STD_CFLAGS): Add INTL_CFLAGS. + 2002-06-17 Elena Zannoni * psim.c (psim_options): Don't choke when gdb invokes us with diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in index 67769921567..d69b5c3691c 100644 --- a/sim/ppc/Makefile.in +++ b/sim/ppc/Makefile.in @@ -113,7 +113,7 @@ CONFIG_CFLAGS = $(BSWAP_CFLAGS) \ $(TERMIO_CFLAGS) \ $(DEVZERO_CFLAGS) -STD_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) +STD_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(WARNING_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) $(INTL_CFLAGS) NOWARN_CFLAGS = $(CFLAGS) $(INLINE_CFLAGS) $(CONFIG_CFLAGS) $(SIM_CFLAGS) $(HDEFINES) $(TDEFINES) $(INCLUDES) BUILD_CFLAGS = -g -O $(INCLUDES) $(WARNING_CFLAGS) @@ -154,6 +154,10 @@ BFD_LIB = ../../bfd/libbfd.a INTLLIBS = @INTLLIBS@ INTLDEPS = @INTLDEPS@ +INTL_DIR = ../../intl +INTL_SRC = $(srcdir)/$(INTL_DIR) +INTL_CFLAGS = -I$(INTL_DIR) -I$(INTL_SRC) + TARGETLIB = libsim.a -- cgit v1.2.1