diff options
| author | Olivier Biot <obiot.ethereal@gmail.com> | 2004-07-29 07:25:11 +0000 |
|---|---|---|
| committer | Olivier Biot <obiot.ethereal@gmail.com> | 2004-07-29 07:25:11 +0000 |
| commit | 26691ff1befbd196ac5ff6eac4a9934541d7dee6 (patch) | |
| tree | e26b626627150862efdf9a90801eb3f3b760bf56 /Makefile.nmake | |
| parent | e1ede171f9fbcca3709a2ac573b3f7958766468f (diff) | |
From Lars Roland: MSVC make fixes.
Many people have recently reported many problems with the nmake build
process. It seems that these problems come from using
epan/makefile.nmake to compile the DISSECTOR_SUPPORT_SOURCES which are
located in /trunk.
Nmake from MSVC6 puts the object code of the DISSECTOR_SUPPORT_SOURCES
in /epan although Nmake expects the object code in /trunk when it
checkes dependencies. Thus DISSECTOR_SUPPORT_OBJECTS are built every
time even when they are already there.
Nmake Version 1.5 (MSVC 2003 Toolkit) puts the object code of the
DISSECTOR_SUPPORT_SOURCES in /trunk instead.
This makes it impossible to use epan/makefile.nmake for compiling the
DISSECTOR_SUPPORT_SOURCES and to make it work for both versions of nmake.
We have to use /trunk/makefile.nmake for compiling the
DISSECTOR_SUPPORT_SOURCES to solve these issues.
It should also be possible to build ethereal without libethereal.dll again.
Once we have moved all DISSECTOR_SUPPORT_SOURCES into a subdirectory of
epan we can get rid of this patchwork in the nmake makefiles.
svn path=/trunk/; revision=11562
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 5afdabd6df..bf286d3344 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -27,13 +27,13 @@ PLATFORM_SRC = capture-wpcap.c include Makefile.common -#include epan\Makefile.common +include epan\Makefile.common BUILT_SOURCES = $(BUILT_SOURCES) \ svnversion.h -#DISSECTOR_SUPPORT_SRC = $(DISSECTOR_SUPPORT_SRC:../=) -#DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj) +DISSECTOR_SUPPORT_SRC = $(DISSECTOR_SUPPORT_SRC:../=) +DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_SRC:.c=.obj) #DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_OBJECTS:../=) ethereal_OBJECTS = $(ethereal_SOURCES:.c=.obj) |