On Tue, Feb 03, 2004 at 03:17:13PM +0100, Lars Roland wrote: > -EXE=../../ethereal.exe ../../tethereal.exe ../../editcap.exe \ > +!IFDEF GTK1 > +DEST=ethereal > +GTK_DIR=$(GTK1_DIR) > +!ELSE > +DEST=ethereal2 > +GTK_DIR=$(GTK2_DIR) > +!ENDIF > + > +EXE=../../$(DEST).exe ../../tethereal.exe ../../editcap.exe \ > ../../text2pcap.exe ../../mergecap.exe > DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll > DOC=../../doc/ethereal.html \ > @@ -49,16 +57,6 @@ > DELIVERABLES=$(EXE) $(DLL) $(DOC) $(GPL) $(HELP) $(PLUGINS) > > > - > -!IFDEF GTK1 > -DEST=ethereal > -GTK_DIR=$(GTK1_DIR) > -!ELSE > -DEST=ethereal2 > -GTK_DIR=$(GTK2_DIR) > -!ENDIF > - > - > $(DEST)-setup-$(VERSION).exe : ethereal.nsi $(DELIVERABLES) Makefile.nmake > $(MAKENSIS) \ > !IF "$(MAKENSIS_MODERN_UI)" != ""
I think there was some discussion as to what version numbers the Ethereal executable image name should reflect. Was it concluded that the image name should include "2" if Ethereal was built for GTK+ 2.x? And, if we make GTK+ 2.x rather than 1.3[.x] the standard version for Ethereal builds at some point, should the Ethereal executable still have that "2" in its name? _______________________________________________ Ethereal-dev mailing list [EMAIL PROTECTED] http://www.ethereal.com/mailman/listinfo/ethereal-dev
