Make it possible to create DLLs with debug information.

Author: bhaible

ChangeLog

@@ -1,3 +1,10 @@
+2003-05-18  Bruno Haible  <[email protected]>
+
+	* lib/Makefile.msvc (DEBUGFLAGS): New variable.
+	(iconv.lib): Use it.
+	* src/Makefile.msvc (DEBUGFLAGS): New variable.
+	* tests/Makefile.msvc (DEBUGFLAGS): New variable.
+
 2003-05-17  Bruno Haible  <[email protected]>
 
 	* Version 1.9 released.

lib/Makefile.msvc

@@ -65,9 +65,11 @@ PICFLAGS = -GD -DBUILDING_LIBICONV -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 -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(IIbindir)\" -DNO_XMALLOC -Dset_relocation_prefix=libiconv_set_relocation_prefix -Drelocate=libiconv_relocate
@@ -118,7 +120,7 @@ iconv.lib : $(OBJECTS)
 
 # iconv.dll and iconv.lib are created together.
 iconv.lib : $(OBJECTS) $(RESOURCES)
-	$(CC) $(MFLAGS) -LD $(OBJECTS) $(RESOURCES) -Feiconv.dll
+	$(CC) $(MFLAGS) $(DEBUGFLAGS) -LD $(OBJECTS) $(RESOURCES) -Feiconv.dll
 
 iconv.res : $(srcdir)/../windows/iconv.rc
 	rc -Fo iconv.res $(srcdir)/../windows/iconv.rc

libcharset/lib/ChangeLog

@@ -1,3 +1,8 @@
+2003-05-18  Bruno Haible  <[email protected]>
+
+	* Makefile.msvc (DEBUGFLAGS): New variable.
+	(charset.lib): Use it.
+
 2003-05-07  Bruno Haible  <[email protected]>
 
 	* Makefile.vms: New file.

libcharset/lib/Makefile.msvc

@@ -58,9 +58,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_LIBCHARSET: Change expansion of LIBCHARSET_DLL_EXPORTED macro.
@@ -105,7 +107,7 @@ charset.lib : $(OBJECTS)
 
 # charset.dll and charset.lib are created together.
 charset.lib : $(OBJECTS) $(RESOURCES)
-	$(CC) $(MFLAGS) -LD $(OBJECTS) $(RESOURCES) -Fecharset.dll
+	$(CC) $(MFLAGS) $(DEBUGFLAGS) -LD $(OBJECTS) $(RESOURCES) -Fecharset.dll
 
 charset.res : $(srcdir)/../windows/charset.rc
 	rc -Fo charset.res $(srcdir)/../windows/charset.rc

src/Makefile.msvc

@@ -38,9 +38,11 @@ IIPREFIX = c:\\usr
 
 !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
 
 # Set to -W3 if you want to see maximum amount of warnings, including stupid

tests/Makefile.msvc

@@ -26,9 +26,11 @@ MFLAGS=-MD
 
 !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
 
 # Directories used by "make":