Wireshark-dev: Re: [Wireshark-dev] [Wireshark-commits] rev 25499: /trunk/ /trunk/: Makefile.com
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Bill Meier <wmeier@xxxxxxxxxxx>
Date: Sat, 21 Jun 2008 09:28:53 -0400
Sake Blok wrote:

On Sat, Jun 21, 2008 at 08:52:37AM -0400, Bill Meier wrote:

Sake Blok wrote:

On Sat, Jun 21, 2008 at 09:45:24AM +0000, sake@xxxxxxxxxxxxx wrote:

Directory: /trunk/
  Changes    Path               Action
  +1 -0      Makefile.common    Modified
  +72 -3     editcap.c          Modified

I seem to have broke the Windows build. I'm firing up my WinXP dev-image
to see if I can fix it... 
I've got a simple Makefile fix I'm about to commit .... :)


I was about to commit the same changes to 'Makefile.nmake', but
won't your changes to 'Makefile.common' break the '*nix' builds?
I had added 'nstime.c' to Makefile.common to make it compile on
my FC8 development image.

Cheers,


Oops....


Seems as to how I broke things the opposite way !
(Sorry)

I'll revert the Makefile.common change.
It seems to me that the right fix for the Windows build is to use editcap_SOURCE, etc. 

I'll dig a bit deeper later today.

Bill