Distribute libgettextpo also on Windows.

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index c718482efc30fc8915ccb23c3d0bdb8f425b7eaa..6a3aa6b34fbf3ee88f7a909cda15028d85273dfe 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-24  Bruno Haible  <bruno@clisp.org>
+
+       * windows/gettextpo.def: New file.
+       * windows/gettextpo.rc: New file.
+       * Makefile.am (EXTRA_DIST): Add them.
+
 2003-08-23  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (config.h_vms): Define HAVE_BTOWC, HAVE_DECL_GETENV,

diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
index beaaabee9d40a183c2b75e896de0e7771e2ae616..e2b8a9857b4a2a3bac2fd34c3a7daa20134958d8 100644 (file)
--- a/gettext-tools/Makefile.am
+++ b/gettext-tools/Makefile.am
@@ -219,4 +219,4 @@ windows/stdbool.h: lib/stdbool_.h
 
 all-local : windows/stdbool.h
 
-EXTRA_DIST += README.woe32 Makefile.msvc config.h.msvc windows/alloca.h windows/fnmatch.h windows/stdbool.h windows/gettextlib.def windows/gettextsrc.def windows/gettextlib.rc windows/gettextsrc.rc
+EXTRA_DIST += README.woe32 Makefile.msvc config.h.msvc windows/alloca.h windows/fnmatch.h windows/stdbool.h windows/gettextlib.def windows/gettextsrc.def windows/gettextpo.def windows/gettextlib.rc windows/gettextsrc.rc windows/gettextpo.rc

diff --git a/gettext-tools/src/Makefile.msvc b/gettext-tools/src/Makefile.msvc
index 3715941b9d555d46e7d1e375b6bf3ba25a8d71ba..3ae6884594f467b50e9433141322f6e3b71fbafe 100644 (file)
--- a/gettext-tools/src/Makefile.msvc
+++ b/gettext-tools/src/Makefile.msvc
@@ -162,7 +162,7 @@ LDADD =
 
 RESOURCES = gettextsrc.res
 
-all : gettextsrc.lib $(PROGRAMS)
+all : gettextsrc.lib $(PROGRAMS) gettextpo.lib
 
 # Compilation rules for $(OBJECTS), with $(PICFLAGS).
 
@@ -455,6 +455,28 @@ msginit.exe : $(msginit_OBJECTS)
 msguniq.exe : $(msguniq_OBJECTS)
        $(CC) $(MFLAGS) $(DEBUGFLAGS) $(msguniq_OBJECTS) gettextsrc.lib ..\lib\gettextlib.lib ..\intl\intl.lib $(libdir)\iconv.lib $(LDADD) -Femsguniq.exe
 
+# Compilation rules for gettextpo.lib objects, with $(PICFLAGS).
+
+gettext-po.obj : gettext-po.c
+       $(CC) $(INCLUDES) $(CFLAGS) $(PICFLAGS) -c gettext-po.c
+
+!if !$(DLL)
+
+gettextpo.lib : gettext-po.obj
+       -$(RM) gettextpo.lib
+       $(AR) $(AR_FLAGS)gettextpo.lib gettext-po.obj
+
+!else
+
+# gettextpo.dll and gettextpo.lib are created together.
+gettextpo.lib : ..\windows\gettextpo.def gettext-po.obj gettextpo.res gettextsrc.lib
+       $(CC) $(MFLAGS) $(DEBUGFLAGS) -LD ..\windows\gettextpo.def gettext-po.obj gettextsrc.lib ..\lib\gettextlib.lib gettextpo.res -Fegettextpo.dll
+
+gettextpo.res : ../windows/gettextpo.rc
+       rc -Fo gettextpo.res ../windows/gettextpo.rc
+
+!endif
+
 install : all force
        -mkdir $(prefix)
        -mkdir $(exec_prefix)
@@ -480,6 +502,13 @@ install : all force
        -mkdir $(datadir)
        -mkdir $(pkgdatadir)
        $(INSTALL_DATA) msgunfmt.tcl $(pkgdatadir)\msgunfmt.tcl
+       -mkdir $(includedir)
+       $(INSTALL_DATA) gettext-po.h $(includedir)\gettext-po.h
+!if $(DLL)
+       $(INSTALL_DATA) gettextpo.dll $(bindir)\gettextpo.dll
+!endif
+       -mkdir $(libdir)
+       $(INSTALL_DATA) gettextpo.lib $(libdir)\gettextpo.lib
 
 installdirs : force
        -mkdir $(prefix)
@@ -489,6 +518,8 @@ installdirs : force
 !endif
        -mkdir $(datadir)
        -mkdir $(pkgdatadir)
+       -mkdir $(includedir)
+       -mkdir $(libdir)
 
 uninstall : force
 !if $(DLL)
@@ -510,6 +541,11 @@ uninstall : force
        $(RM) $(bindir)\msginit.exe
        $(RM) $(bindir)\msguniq.exe
        $(RM) $(pkgdatadir)\msgunfmt.tcl
+       $(RM) $(includedir)\gettext-po.h
+!if $(DLL)
+       $(RM) $(bindir)\gettextpo.dll
+!endif
+       $(RM) $(libdir)\gettextpo.lib
 
 check : all
 

diff --git a/gettext-tools/windows/gettextpo.def b/gettext-tools/windows/gettextpo.def
new file mode 100644 (file)
index 0000000..089da20
--- /dev/null
+++ b/gettext-tools/windows/gettextpo.def
@@ -0,0 +1,12 @@
+LIBRARY gettextpo
+EXPORTS
+po_file_domains
+po_file_free
+po_file_read
+po_message_iterator
+po_message_iterator_free
+po_message_msgid
+po_message_msgid_plural
+po_message_msgstr
+po_message_msgstr_plural
+po_next_message

diff --git a/gettext-tools/windows/gettextpo.rc b/gettext-tools/windows/gettextpo.rc
new file mode 100644 (file)
index 0000000..8a853ad
--- /dev/null
+++ b/gettext-tools/windows/gettextpo.rc
@@ -0,0 +1,39 @@
+/* Resources for gettextpo.dll */
+/* There are 4 occurrences of the version number in this file. */
+
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,12,0,0
+ PRODUCTVERSION 0,12,0,0
+ FILEFLAGSMASK 0x3fL /* VS_FFI_FILEFLAGSMASK */
+#ifdef _DEBUG
+ FILEFLAGS 0x1L  /* VS_FF_DEBUG */
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x10004L  /* VOS_DOS_WINDOWS32 */
+ FILETYPE 0x2L  /* VFT_DLL */
+ FILESUBTYPE 0x0L  /* VFT2_UNKNOWN */
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "04090000"  /* Lang = US English, Charset = ASCII */
+        BEGIN
+            VALUE "Comments", "This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License. You should have received a copy of the GNU General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA\0"
+            VALUE "CompanyName", "Free Software Foundation\0"
+            VALUE "FileDescription", "GPLed libgettextpo for Windows NT/2000/XP and Windows 95/98/ME\0"
+            VALUE "FileVersion", "0.12\0"
+            VALUE "InternalName", "gettextpo.dll\0"
+            VALUE "LegalCopyright", "Copyright (C) 1995-2003\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "gettextpo.dll\0"
+            VALUE "ProductName", "libgettextpo: public API for PO files\0"
+            VALUE "ProductVersion", "0.12\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0409, 0  /* US English, ASCII */
+    END
+END