From: Bruno Haible <bruno@clisp.org>
Date: Mon, 12 May 2003 19:12:04 +0000 (+0000)
Subject: No need for dllexported when building a static library.
X-Git-Tag: v0.12~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1689cb207be4ff3b4e4cc50d76d1944ba749b4fa;p=thirdparty%2Fgettext.git

No need for dllexported when building a static library.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 50f5909ad..20f2c9b90 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-12  Bruno Haible  <bruno@clisp.org>
+
+	* Makefile.msvc (PICFLAGS, CFLAGS): Move BUILDING_* macros from
+	CFLAGS to PICFLAGS.
+	Reported by Perry Rapp.
+
 2003-05-07  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.vms (install): Fix mistake.
diff --git a/gettext-runtime/intl/Makefile.msvc b/gettext-runtime/intl/Makefile.msvc
index ba6bd0a36..59199531a 100644
--- a/gettext-runtime/intl/Makefile.msvc
+++ b/gettext-runtime/intl/Makefile.msvc
@@ -66,7 +66,9 @@ PICFLAGS =
 !else
 # "-GD" (msvc5) optimizes for DLL.
 # mscv4 doesn't know about this flag and ignores it.
-PICFLAGS = -GD
+# -DBUILDING_LIBINTL: Change expansion of LIBINTL_DLL_EXPORTED macro.
+# -DBUILDING_DLL: Change expansion of RELOCATABLE_DLL_EXPORTED macro.
+PICFLAGS = -GD -DBUILDING_LIBINTL -DBUILDING_DLL
 !endif
 
 !if $(DEBUG)
@@ -76,9 +78,7 @@ OPTIMFLAGS = -Od -Z7
 OPTIMFLAGS = -D_NDEBUG -O1
 !endif
 
-# -DBUILDING_LIBINTL: Change expansion of LIBINTL_DLL_EXPORTED macro.
-# -DBUILDING_DLL: Change expansion of RELOCATABLE_DLL_EXPORTED macro.
-CFLAGS = $(MFLAGS) $(WARN_CFLAGS) $(OPTIMFLAGS) -DHAVE_CONFIG_H -DBUILDING_LIBINTL -DBUILDING_DLL -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
+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
 
 INCLUDES = -I. -I.. -I$(includedir)