Tweak Woe32 support.

diff --git a/gettext-runtime/lib/Makefile.msvc b/gettext-runtime/lib/Makefile.msvc
index bc7cb7ecaeec0451c860c2e33a83fe9df97b0d80..404ce00392580eef9133cd665638cb0a9a7dc60d 100644 (file)
--- a/gettext-runtime/lib/Makefile.msvc
+++ b/gettext-runtime/lib/Makefile.msvc
@@ -15,6 +15,10 @@ DEBUG=0
 MFLAGS=
 !endif
 
+# Directories used by "make install":
+prefix = c:\usr
+includedir = $(prefix)\include
+
 # Programs used by "make":
 
 CC = cl
@@ -32,7 +36,7 @@ OPTIMFLAGS = -D_NDEBUG -O1
 
 CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H
 
-INCLUDES =
+INCLUDES = -I. -I.. -I..\intl -I..\..\gettext-tools\lib -I..\..\gettext-tools\windows -I$(includedir)
 
 AR = lib
 AR_FLAGS = /out:

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index a1643dfacd483d5920bfeada2af000cf1a3736c8..4a587fcb470d9a2da028bc3bca0318d18b69096c 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -6,9 +6,11 @@
        * README.woe32: New file.
        * windows/dllexport.h: New file.
        * windows/asprintf.rc: New file.
-       * Makefile.am (EXTRA_DIST): Add them and config.h.msvc.
+       * Makefile.am (EXTRA_DIST): Add them and config.h.msvc and
+       autosprintf.h.in.
        (autosprintf.h): New rule.
        (MOSTLYCLEANFILES): Add autosprintf.h.
+       (dist-hook): Don't distribute autosprintf.h.
        (config.h.msvc, autosprintf.h.msvc-shared): New rules.
 
 2003-02-22  Bruno Haible  <bruno@clisp.org>

diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am
index c49b0fe3e4dee901a92a614dc2cea65c6ddd3b25..40d21edc47fc878e0289c7fb2bbe27074dfc031e 100644 (file)
--- a/gettext-runtime/libasprintf/Makefile.am
+++ b/gettext-runtime/libasprintf/Makefile.am
@@ -32,6 +32,10 @@ all-local $(libasprintf_la_OBJECTS): autosprintf.h
 autosprintf.h: autosprintf.h.in
        cp $(srcdir)/autosprintf.h.in autosprintf.h
 MOSTLYCLEANFILES += autosprintf.h
+EXTRA_DIST += autosprintf.h.in
+
+dist-hook:
+       rm -f $(distdir)/autosprintf.h
 
 
 # Library code.
@@ -189,6 +193,9 @@ config.h.msvc: config.h.in
           < $<; echo; echo '#define snprintf _snprintf') > $@
 
 autosprintf.h.msvc-shared: autosprintf.h.in windows/dllexport.h
-       sed -e 's/extern \([^"]\)/extern LIBASPRINTF_DLL_EXPORTED \1/' -e '/#define _AUTOSPRINTF_H/r windows/dllexport.h' < $< > $@
+       sed -e 's/extern \([^"]\)/extern LIBASPRINTF_DLL_EXPORTED \1/' \
+           -e 's/class /class LIBASPRINTF_DLL_EXPORTED /' \
+           -e 's/struct /struct LIBASPRINTF_DLL_EXPORTED /' \
+           -e '/#define _AUTOSPRINTF_H/r windows/dllexport.h' < $< > $@
 
-EXTRA_DIST += README.woe32 Makefile.msvc config.h.msvc windows/dllexport.h windows/asprintf.rc
+EXTRA_DIST += README.woe32 Makefile.msvc config.h.msvc autosprintf.h.msvc-shared windows/dllexport.h windows/asprintf.rc

diff --git a/gettext-runtime/libasprintf/Makefile.msvc b/gettext-runtime/libasprintf/Makefile.msvc
index ea8f30b49afec8c822a163515ce3227aba9fcb92..6c0f511cb8eeb94b5aff8ed0cdb4efa17c3b3385 100644 (file)
--- a/gettext-runtime/libasprintf/Makefile.msvc
+++ b/gettext-runtime/libasprintf/Makefile.msvc
@@ -62,7 +62,7 @@ OPTIMFLAGS = -D_NDEBUG -O1
 
 # -DBUILDING_LIBASPRINTF: Change expansion of LIBASPRINTF_DLL_EXPORTED macro.
 CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H -DBUILDING_LIBASPRINTF
-CXXFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H -DBUILDING_LIBASPRINTF
+CXXFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H -DBUILDING_LIBASPRINTF -GX
 
 INCLUDES = -I.
 
@@ -138,7 +138,7 @@ install : all force
        $(INSTALL_DATA) asprintf.lib $(libdir)\asprintf.lib
        -mkdir $(prefix)\doc
        -mkdir $(sub_docdir)
-       $(INSTALL_DATA) doc\autosprintf.html $(sub_docdir)\autosprintf.html
+       $(INSTALL_DATA) autosprintf.html $(sub_docdir)\autosprintf.html
 
 installdirs : force
        -mkdir $(prefix)

diff --git a/gettext-runtime/po/Makefile.msvc.sh b/gettext-runtime/po/Makefile.msvc.sh
index 6e43ffc6552434aaf4274595a917842e2906888a..b0abb5a57f385de223d4361877a30778753003fe 100755 (executable)
--- a/gettext-runtime/po/Makefile.msvc.sh
+++ b/gettext-runtime/po/Makefile.msvc.sh
@@ -39,9 +39,9 @@ for cat in $catalogs; do
   cat=`basename $cat`
   lang=`echo $cat | sed -e 's/\.gmo$//'`
 cat <<EOF
-       -mkdir \$(localedir)\\${cat}
-       -mkdir \$(localedir)\\${cat}\\LC_MESSAGES
-       \$(INSTALL_DATA) ${cat}.gmo \$(localedir)\\${cat}\\LC_MESSAGES\\${domain}.mo
+       -mkdir \$(localedir)\\${lang}
+       -mkdir \$(localedir)\\${lang}\\LC_MESSAGES
+       \$(INSTALL_DATA) ${lang}.gmo \$(localedir)\\${lang}\\LC_MESSAGES\\${domain}.mo
 EOF
 done
 cat <<\EOF
@@ -55,8 +55,8 @@ for cat in $catalogs; do
   cat=`basename $cat`
   lang=`echo $cat | sed -e 's/\.gmo$//'`
 cat <<EOF
-       -mkdir \$(localedir)\\${cat}
-       -mkdir \$(localedir)\\${cat}\\LC_MESSAGES
+       -mkdir \$(localedir)\\${lang}
+       -mkdir \$(localedir)\\${lang}\\LC_MESSAGES
 EOF
 done
 cat <<\EOF
@@ -67,7 +67,7 @@ for cat in $catalogs; do
   cat=`basename $cat`
   lang=`echo $cat | sed -e 's/\.gmo$//'`
 cat <<EOF
-       \$(RM) \$(localedir)\\${cat}\\LC_MESSAGES\\${domain}.mo
+       \$(RM) \$(localedir)\\${lang}\\LC_MESSAGES\\${domain}.mo
 EOF
 done
 cat <<\EOF

diff --git a/gettext-runtime/src/Makefile.msvc b/gettext-runtime/src/Makefile.msvc
index b70ec76ac304f876aacd76f3dfd69e87e7e9ca96..28d6456af4db3a4e4c972ced11e9967471234be1 100644 (file)
--- a/gettext-runtime/src/Makefile.msvc
+++ b/gettext-runtime/src/Makefile.msvc
@@ -28,6 +28,13 @@ MFLAGS=-MD
 prefix = c:\usr
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)\bin
+datadir = $(prefix)\share
+localedir = $(datadir)\locale
+IIprefix = c:\\usr
+IIexec_prefix = $(IIprefix)
+IIbindir = $(IIexec_prefix)\\bin
+IIdatadir = $(IIprefix)\\share
+IIlocaledir = $(IIdatadir)\\locale
 
 # Programs used by "make":
 
@@ -52,9 +59,9 @@ OPTIMFLAGS = -Od -Z7
 OPTIMFLAGS = -D_NDEBUG -O1
 !endif
 
-CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H
+CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H -DLOCALEDIR=\"$(IIlocaledir)\"
 
-INCLUDES =
+INCLUDES = -I. -I.. -I..\intl -I..\lib -I..\..\gettext-tools\lib -I..\..\gettext-tools\windows
 
 LN = copy
 RM = -del
@@ -72,21 +79,21 @@ PROGRAMS = gettext.exe ngettext.exe
 
 gettext_OBJECTS = gettext.obj
 ngettext_OBJECTS = ngettext.obj
-LDADD = ..\lib\grt.lib
+LDADD =
 
 all : $(PROGRAMS)
 
 gettext.obj : gettext.c
-       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(prefix)\" -DINSTALLDIR=\"$(bindir)\" -c gettext.c
+       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c gettext.c
 
 ngettext.obj : ngettext.c
-       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(prefix)\" -DINSTALLDIR=\"$(bindir)\" -c ngettext.c
+       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c ngettext.c
 
 gettext.exe : $(gettext_OBJECTS)
-       $(CC) $(gettext_OBJECTS) $(LDADD) -Fegettext.exe
+       $(CC) $(gettext_OBJECTS) ..\lib\grt.lib ..\intl\intl.lib $(LDADD) -Fegettext.exe
 
 ngettext.exe : $(ngettext_OBJECTS)
-       $(CC) $(ngettext_OBJECTS) $(LDADD) -Fengettext.exe
+       $(CC) $(ngettext_OBJECTS) ..\lib\grt.lib ..\intl\intl.lib $(LDADD) -Fengettext.exe
 
 install : all force
        -mkdir $(prefix)