De-special-case pgevent's rc file handling

There's really no need to build win32ver.rc as part of building
pgmsgevent.rc. This will make it sligthly easier to add rc file generation to
the meson build.

diff --git a/src/bin/pgevent/Makefile b/src/bin/pgevent/Makefile
index dea79d3f1371af4173cb77c78efd86d9656e627a..04d49711d8d68cdb2825239aa61f9489f9fabb90 100644 (file)
--- a/src/bin/pgevent/Makefile
+++ b/src/bin/pgevent/Makefile
@@ -17,7 +17,8 @@ ifeq ($(PORTNAME), win32)
 
 OBJS = \
    pgevent.o \
-   pgmsgevent.o
+   pgmsgevent.o \
+   $(WIN32RES)
 NAME=pgevent
 
 SHLIB_LINK =
@@ -29,7 +30,7 @@ install: all install-lib
 
 include $(top_srcdir)/src/Makefile.shlib
 
-pgmsgevent.o: pgmsgevent.rc win32ver.rc
+pgmsgevent.o: pgmsgevent.rc
    $(WINDRES) $< -o $@ --include-dir=$(top_builddir)/src/include --include-dir=$(top_srcdir)/src/include --include-dir=$(srcdir) --include-dir=.
 
 clean distclean: clean-lib

diff --git a/src/bin/pgevent/pgmsgevent.rc b/src/bin/pgevent/pgmsgevent.rc
index e69862e882c7e3bc05635a49c54e773a56c714e1..0885a897e6f8c8941aa9a6ce627e4f9caa1e9196 100644 (file)
--- a/src/bin/pgevent/pgmsgevent.rc
+++ b/src/bin/pgevent/pgmsgevent.rc
@@ -1,4 +1,2 @@
 LANGUAGE 0x9,0x1
 1 11 MSG00001.bin
-
-#include "win32ver.rc"

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 098bc3f1b097191f46ee7805b184e350d1f9abc5..ddb4f25eb1242806f3d74081f7ae69271ef95143 100644 (file)
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -425,7 +425,6 @@ sub mkvcbuild
    $pgevent->AddFiles('src/bin/pgevent', 'pgevent.c', 'pgmsgevent.rc');
    $pgevent->AddResourceFile('src/bin/pgevent', 'Eventlog message formatter',
        'win32');
-   $pgevent->RemoveFile('src/bin/pgevent/win32ver.rc');
    $pgevent->UseDef('src/bin/pgevent/pgevent.def');
    $pgevent->DisableLinkerWarnings('4104');