Compile some files in C++ mode.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 553a6254ae684e61744a3dec2bfe49e538219b7a..0bed04d046be6879efd1507e97d93916f8927408 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-24  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.msvc (format.obj, msgmerge.obj, xgettext.obj, msgattrib.obj,
+       msgcat.obj, msgcomm.obj, msgconv.obj, msgen.obj, msgfilter.obj,
+       msggrep.obj, msguniq.obj): Compile these in C++ mode. This works around
+       the "non-constant initializer" error that we get for addresses of
+       variables in DLLs in C mode.
+
 2003-08-24  Bruno Haible  <bruno@clisp.org>
 
        * msgfilter.c (process_message): Cast xrealloc() result.

diff --git a/gettext-tools/src/Makefile.msvc b/gettext-tools/src/Makefile.msvc
index 139e491063a564c25a760f09ea836fbfbb73e0f4..5f61327755407465731ca0947ed02d16109b58dc 100644 (file)
--- a/gettext-tools/src/Makefile.msvc
+++ b/gettext-tools/src/Makefile.msvc
@@ -237,7 +237,7 @@ plural-table.obj : plural-table.c
        $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c plural-table.c
 
 format.obj : format.c
-       $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format.c
+       $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c -Tp format.c
 
 format-c.obj : format-c.c
        $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c format-c.c
@@ -319,7 +319,7 @@ plural-eval.obj : plural-eval.c
        $(CC) $(INCLUDES) $(CFLAGS) -c plural-eval.c
 
 msgmerge.obj : msgmerge.c
-       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msgmerge.c
+       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msgmerge.c
 
 plural-count.obj : plural-count.c
        $(CC) $(INCLUDES) $(CFLAGS) -c plural-count.c
@@ -337,7 +337,7 @@ read-tcl.obj : read-tcl.c
        $(CC) $(INCLUDES) $(CFLAGS) -c read-tcl.c
 
 xgettext.obj : xgettext.c
-       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c xgettext.c
+       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp xgettext.c
 
 x-c.obj : x-c.c
        $(CC) $(INCLUDES) $(CFLAGS) -c x-c.c
@@ -385,28 +385,28 @@ x-glade.obj : x-glade.c
        $(CC) $(INCLUDES) $(CFLAGS) -c x-glade.c
 
 msgattrib.obj : msgattrib.c
-       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msgattrib.c
+       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msgattrib.c
 
 msgcat.obj : msgcat.c
-       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msgcat.c
+       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msgcat.c
 
 msgcomm.obj : msgcomm.c
-       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msgcomm.c
+       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msgcomm.c
 
 msgconv.obj : msgconv.c
-       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msgconv.c
+       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msgconv.c
 
 msgen.obj : msgen.c
-       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msgen.c
+       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msgen.c
 
 msgexec.obj : msgexec.c
        $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msgexec.c
 
 msgfilter.obj : msgfilter.c
-       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msgfilter.c
+       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msgfilter.c
 
 msggrep.obj : msggrep.c
-       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msggrep.c
+       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msggrep.c
 
 msginit.obj : msginit.c
        $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msginit.c
@@ -415,7 +415,7 @@ localealias.obj : ..\..\gettext-runtime\intl\localealias.c
        $(CC) $(INCLUDES) $(CFLAGS) -DLOCALE_ALIAS_PATH=\"$(IIaliaspath)\" -c ..\..\gettext-runtime\intl\localealias.c
 
 msguniq.obj : msguniq.c
-       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msguniq.c
+       $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c -Tp msguniq.c
 
 msgcmp.exe : $(msgcmp_OBJECTS)
        $(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgcmp_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgcmp.exe