aboutsummaryrefslogtreecommitdiffstats
path: root/image
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2003-03-26 20:17:42 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2003-03-26 20:17:42 +0000
commitda624293e3fa881d887d7fa6d601e535ce76c22d (patch)
tree0b6aa47d76a630705d62d517ea7307966d946b9b /image
parentd6be3ced266ed233c498474334d4fb3ffd66f2ed (diff)
From Graham Bloice: make the RC_VERSION variable in config.nmake
comma-separated, so that the resources will be built correctly and the version number correctly displayed in the GUI, and make the resources dependent on "config.nmake" so that they're rebuilt if it's changed. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7373 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'image')
-rw-r--r--image/Makefile.nmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/image/Makefile.nmake b/image/Makefile.nmake
index b97c84f6c0..ba7ef43df0 100644
--- a/image/Makefile.nmake
+++ b/image/Makefile.nmake
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.nmake,v 1.4 2001/07/12 21:02:06 guy Exp $
+# $Id: Makefile.nmake,v 1.5 2003/03/26 20:17:42 guy Exp $
#
include ..\config.nmake
@@ -7,27 +7,27 @@ include ..\config.nmake
ALL_RC=ethereal.rc tethereal.rc editcap.rc text2pcap.rc mergecap.rc
all : $(ALL_RC)
-ethereal.rc : ethereal.rc.in
+ethereal.rc : ethereal.rc.in ..\config.nmake
sed -e s/@VERSION@/$(VERSION)/ \
-e s/@RC_VERSION@/$(RC_VERSION)/ \
< ethereal.rc.in > $@
-tethereal.rc : tethereal.rc.in
+tethereal.rc : tethereal.rc.in ..\config.nmake
sed -e s/@VERSION@/$(VERSION)/ \
-e s/@RC_VERSION@/$(RC_VERSION)/ \
< tethereal.rc.in > $@
-editcap.rc : editcap.rc.in
+editcap.rc : editcap.rc.in ..\config.nmake
sed -e s/@VERSION@/$(VERSION)/ \
-e s/@RC_VERSION@/$(RC_VERSION)/ \
< editcap.rc.in > $@
-mergecap.rc : mergecap.rc.in
+mergecap.rc : mergecap.rc.in ..\config.nmake
sed -e s/@VERSION@/$(VERSION)/ \
-e s/@RC_VERSION@/$(RC_VERSION)/ \
< mergecap.rc.in > $@
-text2pcap.rc : text2pcap.rc.in
+text2pcap.rc : text2pcap.rc.in ..\config.nmake
sed -e s/@VERSION@/$(VERSION)/ \
-e s/@RC_VERSION@/$(RC_VERSION)/ \
< text2pcap.rc.in > $@