From Graham Bloice: add resource information to libethereal.dll.

svn path=/trunk/; revision=11388

5 files changed, 45 insertions, 4 deletions

diff --git a/Makefile.am b/Makefile.am
index d8a7f41a41..be2e106b21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -465,6 +465,7 @@ EXTRA_DIST = \
 	image/hi48-app-ethereal.png	\
 	image/icon-ethereal.xpm	\
 	image/icon-excl.xpm	\
+	image/libethereal.rc.in	\
 	image/lo16-app-ethereal.png	\
 	image/lo32-app-ethereal.png	\
 	image/lo48-app-ethereal.png	\
diff --git a/Makefile.nmake b/Makefile.nmake
index 926e86ea27..a9b130625c 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -114,7 +114,7 @@ randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
 
 EXECUTABLES=ethereal.exe ethereal-gtk2.exe tethereal.exe editcap.exe mergecap.exe text2pcap.exe
 
-RESOURCES=image\ethereal.res image\tethereal.res image\editcap.res image\mergecap.res image\text2pcap.res
+RESOURCES=image\ethereal.res image\libethereal.res image\tethereal.res image\editcap.res image\mergecap.res image\text2pcap.res
 
 all: config.h tools wiretap epan image $(EXECUTABLES) $(RESOURCES) doc
 
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 2665fc7a7b..565f4d8088 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -68,11 +68,12 @@ all: ftypes dfilter ethereal.lib
 libethereal.lib: libethereal.dll
 libethereal.exp: libethereal.dll
 
-libethereal.dll: ..\config.h $(OBJECTS) libethereal.def ftypes dfilter doxygen
+libethereal.dll: ..\config.h $(OBJECTS) libethereal.def ftypes dfilter doxygen ..\image\libethereal.res
 	$(link) $(dlllflags) $(conlibsdll) \
 		$(LOCAL_LDFLAGS) \
 		/DEF:libethereal.def /OUT:libethereal.dll \
-		/IMPLIB:libethereal.lib $(OBJECTS) $(libethereal_LIBS)
+		/IMPLIB:libethereal.lib $(OBJECTS) $(libethereal_LIBS) \
+		..\image\libethereal.res \
 		
 
 ethereal.lib	: ..\config.h $(OBJECTS)
diff --git a/image/Makefile.nmake b/image/Makefile.nmake
index 2732c5326f..dc15d9afad 100644
--- a/image/Makefile.nmake
+++ b/image/Makefile.nmake
@@ -4,7 +4,7 @@
 
 include ..\config.nmake
 
-ALL_RC=ethereal.rc tethereal.rc editcap.rc text2pcap.rc mergecap.rc
+ALL_RC=ethereal.rc libethereal.rc tethereal.rc editcap.rc text2pcap.rc mergecap.rc
 all : $(ALL_RC)
 
 ethereal.rc   : ethereal.rc.in ..\config.nmake
@@ -12,6 +12,11 @@ ethereal.rc   : ethereal.rc.in ..\config.nmake
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
 		< ethereal.rc.in > $@
 
+libethereal.rc: libethereal.rc.in ..\config.nmake
+	sed -e s/@VERSION@/$(VERSION)/ \
+		-e s/@RC_VERSION@/$(RC_VERSION)/ \
+		< libethereal.rc.in > $@
+
 tethereal.rc  : tethereal.rc.in ..\config.nmake
 	sed -e s/@VERSION@/$(VERSION)/ \
 		-e s/@RC_VERSION@/$(RC_VERSION)/ \
diff --git a/image/libethereal.rc.in b/image/libethereal.rc.in
new file mode 100644
index 0000000000..9a634558f0
--- /dev/null
+++ b/image/libethereal.rc.in
@@ -0,0 +1,34 @@
+#include "winver.h"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @RC_VERSION@,0
+ PRODUCTVERSION @RC_VERSION@,0
+ FILEFLAGSMASK 0x0L
+#ifdef _DEBUG
+ FILEFLAGS 0x3L
+#else
+ FILEFLAGS 0x2L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "The Ethereal developer community, http://www.ethereal.com/\0"
+            VALUE "FileDescription", "Ethereal dissector library\0"
+            VALUE "FileVersion", "@VERSION@\0"
+            VALUE "InternalName", "libethereal @VERSION@\0"
+            VALUE "LegalCopyright", "Copyright © 2000 Gerald Combs <gerald@ethereal.com>, Gilbert Ramirez <gram@alumni.rice.edu> and others\0"
+            VALUE "OriginalFilename", "libethereal.dll\0"
+            VALUE "ProductName", "Ethereal\0"
+            VALUE "ProductVersion", "@VERSION@\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END