Hi Yaniv,
For the reference, here's more input:
http://www.ethereal.com/lists/ethereal-cvs/200407/msg00275.html
The Makefile.nmake files contain NMAKE-isms where they automatically
append/delete "../" to the sources, like in:
DISSECTOR_SUPPORT_SRC = $(DISSECTOR_SUPPORT_SRC:../=)
DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj)
Those NMAKE-isms were used in a special manner to circumvent a known
bug of some NMAKE versions (search for "hack nmake" in ethereal-cvs
messages over the past 6 weeks).
When I replied you yesterday, I also ran the very same procedure:
WINNT> VCVARS32.BAT
WINNT> nmake -f Makefile.nmake distclean
cygwin$ find . -name \*.obj -exec rm "{}" \;
cygwin$ svn update
WINNT> nmake -f Makefile.nmake packaging > 1_make
cygwin$ tail -f 1_make
And the procedure ran successfully with MSVC6 out-of-the-box.
FYI creating an unified diff with SVN is *very* simple:
cygwin$ svn diff > svn.diff
You can also specify the files to check for writing a patch, but
that's optional. In that case, all files in the repository will be
considered (won't work for new files that aren't yet in the
repository).
Maybe you have a special version of NMAKE?
Best regards,
Olivier
----- Original Message -----
From: "Yaniv Kaul" <ykaul@xxxxxxxxxxxx>
To: "Ethereal '" <ethereal-dev@xxxxxxxxxxxx>
Sent: Wednesday, August 04, 2004 12:55 AM
Subject: [Ethereal-dev] Patch to get the Win32 build to work again
| Well, one can't <rant< </rant> all the time.
| Trying to get the Win32 build to work:
|
| 1. distclean: It doesn't seem to delete all the object files in the
root
| dir that are a result of a compilation of $(DISSECTOR_SUPPORT_SRC) -
| defined in epan\Makefile.common.
| Why is it in epan\Makefile.common, and the files are not in epan but
in
| the root is beyond me. One of them (the location of the files or the
| decleration in the right Makefile) is probably wrong.
|
| 2. Anyway, changing the definition from:
| DISSECTOR_SUPPORT_SRC = \
| adler32.c \
| ...
|
| to:
| DISSECTOR_SUPPORT_SRC = \
| ../adler32.c \
|
| seemed to have solved the problem for now. I'm ashamed to say I
failed
| to understand this 'svn diff' stuff, so attached is the complete
file :(
| I'd appreciate if anyone can tell me how to do it (under cygwin or
via
| RapidSVN).
|
| It also made distclean work almost right - just need to get rid of
| epan\print.obj and epan\ps.obj
|
| Y.
|
----------------------------------------------------------------------
----------
| # Makefile.common
| # Contains the stuff from Makefile.am and Makefile.nmake that is
| # a) common to both files and
| # b) portable between both files
| #
| # $Id: Makefile.common 11559 2004-07-29 00:11:14Z obiot $
| #
| # Ethereal - Network traffic analyzer
| # By Gerald Combs <gerald@xxxxxxxxxxxx>
| # Copyright 1998 Gerald Combs
| #
| # This program is free software; you can redistribute it and/or
| # modify it under the terms of the GNU General Public License
| # as published by the Free Software Foundation; either version 2
| # of the License, or (at your option) any later version.
| #
| # This program is distributed in the hope that it will be useful,
| # but WITHOUT ANY WARRANTY; without even the implied warranty of
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
| # GNU General Public License for more details.
| #
| # You should have received a copy of the GNU General Public License
| # along with this program; if not, write to the Free Software
| # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
|
|
|
| # dissector helpers (needed from the dissectors, but not a dissector
itself)
| DISSECTOR_SUPPORT_SRC = \
| ../adler32.c \
| ../afn.c \
| ../asn1.c \
| ../column.c \
| ../crc16.c \
| ../crc32.c \
| ../crypt-des.c \
| ../crypt-md4.c \
| ../crypt-md5.c \
| ../crypt-rc4.c \
| ../follow.c \
| ../h225-persistentdata.c \
| ../in_cksum.c \
| ../ipproto.c \
| ../prefs.c \
| ../ptvcursor.c \
| ../reassemble.c \
| ../req_resp_hdrs.c \
| ../t35.c \
| ../tap.c \
| ../util.c \
| ../xdlc.c \
| ../xmlstub.c
|
|
----------------------------------------------------------------------
----------
| _______________________________________________
| Ethereal-dev mailing list
| Ethereal-dev@xxxxxxxxxxxx
| http://www.ethereal.com/mailman/listinfo/ethereal-dev
|
