Makefile.tpl (configure-gcc): Depend on maybe-configure-intl.

top:
	* Makefile.tpl (configure-gcc): Depend on maybe-configure-intl.
	* Makefile.in: Regenerate.
config:
	* gettext.m4: Delete all former contents.
	(ZW_GNU_GETTEXT_SISTER_DIR): New macro.
	* progtest.m4: New file.
gcc:
	* Makefile.in (top_builddir): Set to "..", not ".".
	(INTLLIBS, INTLDEPS): Delete.
	(LIBINTL, LIBINTL_DEP, LIBICONV_DEP): New variables to be substituted.
	(LIBDEPS): Add $(LIBICONV_DEP).
	(LIBS): Take out $(INTLLIBS), add $(LIBINTL) and $(LIBICONV).
	(INCLUDES): Replace -I../intl with @INCINTL@.
	($(top_builddir)/intl/libintl.a): Delete rule.
	(stage2-start, stage3-start, stage4-start, stageprofile-start,
	stagefeedback-start): Use $$ for variable to be evaluated by
	shell, not make.
	* acconfig.h (ENABLE_NLS, HAVE_CATGETS, HAVE_GETTEXT,
	HAVE_LC_MESSAGES, HAVE_STPCPY): Delete.
	* aclocal.m4: sinclude ../config/progtest.m4.  Add
	contents of lcmessage.m4 from gettext distro.
	* configure.in: Check for wchar.h and setlocale.  Set
	LIBICONV_DEP to the empty string and substitute it.
	Call AM_LC_MESSAGES.  Delete AC_ARG_ENABLE for --enable-nls;
	this is handled elsewhere.  Use ZW_GNU_GETTEXT_SISTER_DIR,
	not CY_GNU_GETTEXT.  Clear $LIBICONV if its text is included
	in $LIBINTL, to avoid linking it twice.
	* configure, config.in: Regenerate.
intl:
	* README: Update.
	* Makefile.in (INSTALL, INSTALL_DATA, MKINSTALLDIRS,
	mkinstalldirs, gettextsrcdir, l): Delete.
	(COMPILE): Add $(DEFS-$@), remove $(XCFLAGS).
	(HEADERS): libgnuintl.h not libgnuintl.h.in.  Remove os2compat.h.
	(SOURCES): Remove os2compat.c.
	(DEFS-dcigettext.o, DEFS-localealias.o, DEFS-localcharset.o,
	DEFS-relocatable.o): New.
	(all-yes): Add config.intl.
	(libintl.h): Use cp, not cat.
	(INCLUDES): Remove -I..
	(TAGS, CTAGS, ID): Word wrap.
	(mostlyclean, distclean): Remove junk.
	(config.intl): New rule.
	* aclocal.m4: sinclude ../config/progtest.m4 instead of
	including it inline.
	* config.intl.in: New file.
	* configure.in: Take out unnecessary AC_CONFIG_AUX_DIR.
	Take out AC_DEFINEs for LOCALEDIR, LOCALE_ALIAS_PATH,
	LIBDIR, INSTALLDIR.  Set LIBINTL_DEP and INCINTL and AC_SUBST
	them.  Add config.intl to AC_OUTPUT.
	* os2compat.c, os2compat.h: Delete, unused.

From-SVN: r69071

1 files changed, 20 insertions, 30 deletions

diff --git a/intl/Makefile.in b/intl/Makefile.in
index a21675efcc4..b9edebd3f9d 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -36,16 +36,8 @@ libdir = @libdir@
 includedir = @includedir@
 datadir = @datadir@
 localedir = $(datadir)/locale
-gettextsrcdir = $(datadir)/gettext/intl
 aliaspath = $(localedir)
 
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-
-l = @INTL_LIBTOOL_SUFFIX_PREFIX@
-
 AR = ar
 CC = @CC@
 RANLIB = @RANLIB@
@@ -57,7 +49,7 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 DEFS = -DHAVE_CONFIG_H
 
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+COMPILE = $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(DEFS-$@) $(INCLUDES)
 
 HEADERS = \
   gmo.h \
@@ -68,8 +60,7 @@ HEADERS = \
   eval-plural.h \
   localcharset.h \
   relocatable.h \
-  os2compat.h \
-  libgnuintl.h.in
+  libgnuintl.h
 SOURCES = \
   bindtextdom.c \
   dcgettext.c \
@@ -92,7 +83,6 @@ SOURCES = \
   localename.c \
   log.c \
   osdep.c \
-  os2compat.c \
   intl-compat.c
 OBJECTS = \
   bindtextdom.o \
@@ -118,8 +108,13 @@ OBJECTS = \
   osdep.o \
   intl-compat.o
 
+DEFS-dcigettext.o = -DLOCALEDIR="\"$(localedir)\""
+DEFS-localealias.o = -DLOCALE_ALIAS_PATH="\"$(aliaspath)\""
+DEFS-localcharset.o = -DLIBDIR="\"$(libdir)\""
+DEFS-relocatable.o = -DINSTALLDIR="\"$(libdir)\""
+
 all: all-@USE_INCLUDED_LIBINTL@
-all-yes: libintl.a libintl.h
+all-yes: libintl.a libintl.h config.intl
 all-no: # nothing
 
 libintl.a: $(OBJECTS)
@@ -128,7 +123,7 @@ libintl.a: $(OBJECTS)
 	$(RANLIB) $@
 
 libintl.h: $(srcdir)/libgnuintl.h
-	cat $(srcdir)/libgnuintl.h > $@
+	cp $(srcdir)/libgnuintl.h $@
 
 .SUFFIXES:
 .SUFFIXES: .c .y .o
@@ -140,7 +135,7 @@ libintl.h: $(srcdir)/libgnuintl.h
 	$(YACC) $(YFLAGS) --output $@ $<
 	rm -f $*.h
 
-INCLUDES = -I. -I$(srcdir) -I..
+INCLUDES = -I. -I$(srcdir)
 
 check: all
 
@@ -167,35 +162,27 @@ localcharset.o: localcharset.h
 localealias.o localcharset.o relocatable.o: relocatable.h
 
 tags: TAGS
-
 TAGS: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
+	here=`pwd`; cd $(srcdir) && \
+		etags -o $$here/TAGS $(HEADERS) $(SOURCES)
 
 ctags: CTAGS
-
 CTAGS: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
+	here=`pwd`; cd $(srcdir) && \
+		ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
 
 id: ID
-
 ID: $(HEADERS) $(SOURCES)
-	here=`pwd`; cd $(srcdir) && mkid -f$$here/ID $(HEADERS) $(SOURCES)
-
+	here=`pwd`; cd $(srcdir) && \
+		mkid -f$$here/ID $(HEADERS) $(SOURCES)
 
 mostlyclean:
-	rm -f *.a *.la *.o *.obj *.lo core core.*
-	rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed
-	rm -f -r .libs _libs
+	rm -f *.a *.la *.o *.obj *.lo core core.* libintl.h
 
 clean: mostlyclean
 
 distclean: clean
 	rm -f Makefile ID TAGS
-	if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \
-	  rm -f ChangeLog.inst $(DISTFILES.normal); \
-	else \
-	  : ; \
-	fi
 
 maintainer-clean: distclean
 
@@ -207,6 +194,9 @@ distdir:
 Makefile: Makefile.in config.status
 	CONFIG_HEADERS= CONFIG_FILES=Makefile $(SHELL) ./config.status
 
+config.intl: config.intl.in config.status
+	CONFIG_HEADERS= CONFIG_FILES=config.intl $(SHELL) ./config.status
+
 config.h: cstamp-h; @:
 cstamp-h: config.h.in config.status
 	CONFIG_HEADERS=config.h CONFIG_FILES= $(SHELL) config.status