From fbda227030ae7f5472af72ec8b024b3094ba6419 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 18 May 2003 11:21:38 +0000 Subject: [PATCH] Make it possible to create DLLs and .exes with debug information. --- gettext-runtime/intl/ChangeLog | 5 ++++ gettext-runtime/intl/Makefile.msvc | 4 ++- gettext-runtime/libasprintf/ChangeLog | 5 ++++ gettext-runtime/libasprintf/Makefile.msvc | 4 ++- gettext-runtime/src/ChangeLog | 5 ++++ gettext-runtime/src/Makefile.msvc | 6 ++-- gettext-tools/lib/ChangeLog | 5 ++++ gettext-tools/lib/Makefile.msvc | 4 ++- gettext-tools/src/ChangeLog | 9 ++++++ gettext-tools/src/Makefile.msvc | 34 ++++++++++++----------- 10 files changed, 60 insertions(+), 21 deletions(-) diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 942b9b523..9ba0c0c23 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,8 @@ +2003-05-18 Bruno Haible + + * Makefile.msvc (DEBUGFLAGS): New variable. + (intl.lib): Use it. + 2003-05-17 Bruno Haible * gettext-0.12 released. diff --git a/gettext-runtime/intl/Makefile.msvc b/gettext-runtime/intl/Makefile.msvc index 59199531a..552a3f6c9 100644 --- a/gettext-runtime/intl/Makefile.msvc +++ b/gettext-runtime/intl/Makefile.msvc @@ -73,9 +73,11 @@ PICFLAGS = -GD -DBUILDING_LIBINTL -DBUILDING_DLL !if $(DEBUG) OPTIMFLAGS = -Od -Z7 +DEBUGFLAGS = -Z7 !else # Some people prefer -O2 -G6 instead of -O1, but -O2 is not reliable in MSVC5. OPTIMFLAGS = -D_NDEBUG -O1 +DEBUGFLAGS = !endif CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H -DLOCALEDIR=\"$(IIlocaledir)\" -DLOCALE_ALIAS_PATH=\"$(IIaliaspath)\" -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(IIbindir)\" -DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 @@ -186,7 +188,7 @@ intl.lib : $(OBJECTS) # intl.dll and intl.lib are created together. intl.lib : $(OBJECTS) $(RESOURCES) - $(CC) $(MFLAGS) -LD $(OBJECTS) $(libdir)\iconv.lib $(RESOURCES) -Feintl.dll + $(CC) $(MFLAGS) $(DEBUGFLAGS) -LD $(OBJECTS) $(libdir)\iconv.lib $(RESOURCES) -Feintl.dll intl.res : $(srcdir)\..\windows\intl.rc rc -Fo intl.res $(srcdir)\..\windows\intl.rc diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog index 4d5b4aa26..27f7209c7 100644 --- a/gettext-runtime/libasprintf/ChangeLog +++ b/gettext-runtime/libasprintf/ChangeLog @@ -1,3 +1,8 @@ +2003-05-18 Bruno Haible + + * Makefile.msvc (DEBUGFLAGS): New variable. + (asprintf.lib): Use it. + 2003-05-17 Bruno Haible * gettext-0.12 released. diff --git a/gettext-runtime/libasprintf/Makefile.msvc b/gettext-runtime/libasprintf/Makefile.msvc index 4f2b2f841..27cf77383 100644 --- a/gettext-runtime/libasprintf/Makefile.msvc +++ b/gettext-runtime/libasprintf/Makefile.msvc @@ -60,9 +60,11 @@ PICFLAGS = -GD !if $(DEBUG) OPTIMFLAGS = -Od -Z7 +DEBUGFLAGS = -Z7 !else # Some people prefer -O2 -G6 instead of -O1, but -O2 is not reliable in MSVC5. OPTIMFLAGS = -D_NDEBUG -O1 +DEBUGFLAGS = !endif # -DBUILDING_LIBASPRINTF: Change expansion of LIBASPRINTF_DLL_EXPORTED macro. @@ -123,7 +125,7 @@ asprintf.lib : $(OBJECTS) # asprintf.dll and asprintf.lib are created together. asprintf.lib : $(OBJECTS) $(RESOURCES) - $(CC) $(MFLAGS) -LD $(OBJECTS) $(RESOURCES) -Feasprintf.dll + $(CC) $(MFLAGS) $(DEBUGFLAGS) -LD $(OBJECTS) $(RESOURCES) -Feasprintf.dll asprintf.res : windows/asprintf.rc rc -Fo asprintf.res windows/asprintf.rc diff --git a/gettext-runtime/src/ChangeLog b/gettext-runtime/src/ChangeLog index a58a69762..c9639cae7 100644 --- a/gettext-runtime/src/ChangeLog +++ b/gettext-runtime/src/ChangeLog @@ -1,3 +1,8 @@ +2003-05-18 Bruno Haible + + * Makefile.msvc (DEBUGFLAGS): New variable. + (gettext.exe, ngettext.exe): Use it, and MFLAGS too. + 2003-05-17 Bruno Haible * gettext-0.12 released. diff --git a/gettext-runtime/src/Makefile.msvc b/gettext-runtime/src/Makefile.msvc index 4a9714bc1..f8e034274 100644 --- a/gettext-runtime/src/Makefile.msvc +++ b/gettext-runtime/src/Makefile.msvc @@ -64,9 +64,11 @@ PICFLAGS = -GD !if $(DEBUG) OPTIMFLAGS = -Od -Z7 +DEBUGFLAGS = -Z7 !else # Some people prefer -O2 -G6 instead of -O1, but -O2 is not reliable in MSVC5. OPTIMFLAGS = -D_NDEBUG -O1 +DEBUGFLAGS = !endif CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H -DLOCALEDIR=\"$(IIlocaledir)\" @@ -100,10 +102,10 @@ ngettext.obj : ngettext.c $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c ngettext.c gettext.exe : $(gettext_OBJECTS) - $(CC) $(gettext_OBJECTS) ..\lib\grt.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Fegettext.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(gettext_OBJECTS) ..\lib\grt.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Fegettext.exe ngettext.exe : $(ngettext_OBJECTS) - $(CC) $(ngettext_OBJECTS) ..\lib\grt.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Fengettext.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(ngettext_OBJECTS) ..\lib\grt.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Fengettext.exe install : all force -mkdir $(prefix) diff --git a/gettext-tools/lib/ChangeLog b/gettext-tools/lib/ChangeLog index 0fbbce5e7..68a20906f 100644 --- a/gettext-tools/lib/ChangeLog +++ b/gettext-tools/lib/ChangeLog @@ -1,3 +1,8 @@ +2003-05-18 Bruno Haible + + * Makefile.msvc (DEBUGFLAGS): New variable. + (gettextlib.lib): Use it. + 2003-05-17 Bruno Haible * gettext-0.12 released. diff --git a/gettext-tools/lib/Makefile.msvc b/gettext-tools/lib/Makefile.msvc index ad9d8e002..db287354b 100644 --- a/gettext-tools/lib/Makefile.msvc +++ b/gettext-tools/lib/Makefile.msvc @@ -53,9 +53,11 @@ PICFLAGS = -GD !if $(DEBUG) OPTIMFLAGS = -Od -Z7 +DEBUGFLAGS = -Z7 !else # Some people prefer -O2 -G6 instead of -O1, but -O2 is not reliable in MSVC5. OPTIMFLAGS = -D_NDEBUG -O1 +DEBUGFLAGS = !endif CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H -DEXEEXT=\".exe\" -DDEPENDS_ON_LIBINTL=1 -DDEPENDS_ON_LIBICONV=1 @@ -278,7 +280,7 @@ gettextlib.lib : $(OBJECTS) # gettextlib.dll and gettextlib.lib are created together. gettextlib.lib : ..\windows\gettextlib.def $(OBJECTS) $(RESOURCES) - $(CC) $(MFLAGS) -LD ..\windows\gettextlib.def $(OBJECTS) ..\intl\intl.lib $(libdir)\iconv.lib $(RESOURCES) -Fegettextlib.dll + $(CC) $(MFLAGS) $(DEBUGFLAGS) -LD ..\windows\gettextlib.def $(OBJECTS) ..\intl\intl.lib $(libdir)\iconv.lib $(RESOURCES) -Fegettextlib.dll gettextlib.res : ../windows/gettextlib.rc rc -Fo gettextlib.res ../windows/gettextlib.rc diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index ea6ec5c2e..4ba9be546 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,12 @@ +2003-05-18 Bruno Haible + + * Makefile.msvc (DEBUGFLAGS): New variable. + (gettextsrc.lib): Use it. + (msgcmp.exe, msgfmt.exe, msgmerge.exe, msgunfmt.exe, xgettext.exe, + msgattrib.exe, msgcat.exe, msgcomm.exe, msgconv.exe, msgen.exe, + msgexec.exe, msgfilter.exe, msggrep.exe, msginit.exe, msguniq.exe): + Use it, and MFLAGS too. + 2003-05-17 Bruno Haible * gettext-0.12 released. diff --git a/gettext-tools/src/Makefile.msvc b/gettext-tools/src/Makefile.msvc index b8943434f..a1cf5bc28 100644 --- a/gettext-tools/src/Makefile.msvc +++ b/gettext-tools/src/Makefile.msvc @@ -74,9 +74,11 @@ PICFLAGS = -GD !if $(DEBUG) OPTIMFLAGS = -Od -Z7 +DEBUGFLAGS = -Z7 !else # Some people prefer -O2 -G6 instead of -O1, but -O2 is not reliable in MSVC5. OPTIMFLAGS = -D_NDEBUG -O1 +DEBUGFLAGS = !endif CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H -DLOCALEDIR=\"$(IIlocaledir)\" -DLOCALE_ALIAS_PATH=\"$(IIaliaspath)\" -DGETTEXTJAR=\"$(IIjardir)\\gettext.jar\" -DLIBDIR=\"$(IIlibdir)\" -DGETTEXTDATADIR=\"$(IIpkgdatadir)\" -DPROJECTSDIR=\"$(IIprojectsdir)\" @@ -277,7 +279,7 @@ gettextsrc.lib : $(OBJECTS) # gettextsrc.dll and gettextsrc.lib are created together. gettextsrc.lib : ..\windows\gettextsrc.def $(OBJECTS) $(RESOURCES) - $(CC) $(MFLAGS) -LD ..\windows\gettextsrc.def $(OBJECTS) ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(RESOURCES) -Fegettextsrc.dll + $(CC) $(MFLAGS) $(DEBUGFLAGS) -LD ..\windows\gettextsrc.def $(OBJECTS) ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(RESOURCES) -Fegettextsrc.dll gettextsrc.res : ../windows/gettextsrc.rc rc -Fo gettextsrc.res ../windows/gettextsrc.rc @@ -398,49 +400,49 @@ msguniq.obj : msguniq.c $(CC) $(INCLUDES) $(CFLAGS) -DINSTALLPREFIX=\"$(IIprefix)\" -DINSTALLDIR=\"$(IIbindir)\" -c msguniq.c msgcmp.exe : $(msgcmp_OBJECTS) - $(CC) $(msgcmp_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgcmp.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgcmp_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgcmp.exe msgfmt.exe : $(msgfmt_OBJECTS) - $(CC) $(msgfmt_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgfmt.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgfmt_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgfmt.exe msgmerge.exe : $(msgmerge_OBJECTS) - $(CC) $(msgmerge_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgmerge.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgmerge_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgmerge.exe msgunfmt.exe : $(msgunfmt_OBJECTS) - $(CC) $(msgunfmt_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgunfmt.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgunfmt_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgunfmt.exe xgettext.exe : $(xgettext_OBJECTS) - $(CC) $(xgettext_OBJECTS) ..\libuniname\uniname.lib gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Fexgettext.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(xgettext_OBJECTS) ..\libuniname\uniname.lib gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Fexgettext.exe msgattrib.exe : $(msgattrib_OBJECTS) - $(CC) $(msgattrib_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgattrib.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgattrib_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgattrib.exe msgcat.exe : $(msgcat_OBJECTS) - $(CC) $(msgcat_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgcat.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgcat_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgcat.exe msgcomm.exe : $(msgcomm_OBJECTS) - $(CC) $(msgcomm_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgcomm.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgcomm_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgcomm.exe msgconv.exe : $(msgconv_OBJECTS) - $(CC) $(msgconv_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgconv.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgconv_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgconv.exe msgen.exe : $(msgen_OBJECTS) - $(CC) $(msgen_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgen.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgen_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgen.exe msgexec.exe : $(msgexec_OBJECTS) - $(CC) $(msgexec_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgexec.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgexec_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgexec.exe msgfilter.exe : $(msgfilter_OBJECTS) - $(CC) $(msgfilter_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgfilter.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(msgfilter_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsgfilter.exe msggrep.exe : $(msggrep_OBJECTS) - $(CC) $(msggrep_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsggrep.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(msggrep_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsggrep.exe msginit.exe : $(msginit_OBJECTS) - $(CC) $(msginit_OBJECTS) ..\intl\localename.obj gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsginit.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(msginit_OBJECTS) ..\intl\localename.obj gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsginit.exe msguniq.exe : $(msguniq_OBJECTS) - $(CC) $(msguniq_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsguniq.exe + $(CC) $(MFLAGS) $(DEBUGFLAGS) $(msguniq_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsguniq.exe install : all force -mkdir $(prefix) -- 2.47.3