diff options
| author | Gerald Combs <gerald@wireshark.org> | 2004-02-23 22:45:24 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2004-02-23 22:45:24 +0000 |
| commit | 5de3a44126731eb7686eca522d99a26d1fedce2f (patch) | |
| tree | 1a43fdef838e99e2ed8a3147106185e0daa31282 | |
| parent | 25510cf2095aac4448a3ebb495ff01baff957406 (diff) | |
| download | wireshark-5de3a44126731eb7686eca522d99a26d1fedce2f.tar.gz | |
MSVC doesn't like having header files in .c=.obj targets.
Fix dftest compiling under Windows.
svn path=/trunk/; revision=10208
| -rw-r--r-- | Makefile.common | 5 | ||||
| -rw-r--r-- | Makefile.nmake | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.common b/Makefile.common index 77e6e483a5..158842a92f 100644 --- a/Makefile.common +++ b/Makefile.common @@ -3,7 +3,7 @@ # a) common to both files and # b) portable between both files # -# $Id: Makefile.common,v 1.23 2004/02/23 21:14:25 gerald Exp $ +# $Id: Makefile.common,v 1.24 2004/02/23 22:45:24 gerald Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -697,7 +697,6 @@ BUILT_SOURCES = \ ETHEREAL_COMMON_SRC = \ $(PLATFORM_SRC) \ $(DISSECTOR_SUPPORT_SRC) \ - $(BUILT_SOURCES) \ capture_stop_conditions.c \ cfile.c \ conditions.c \ @@ -713,6 +712,7 @@ ETHEREAL_COMMON_SRC = \ # corresponding headers ETHEREAL_COMMON_INCLUDES = \ $(DISSECTOR_SUPPORT_INCLUDES) \ + $(BUILT_SOURCES) \ capture_stop_conditions.h \ cfile.h \ color.h \ @@ -821,7 +821,6 @@ editcap_SOURCES = \ dftest_SOURCES = \ $(DISSECTOR_SRC) \ $(DISSECTOR_SUPPORT_SRC) \ - $(BUILT_SOURCES) \ register.c \ dftest.c diff --git a/Makefile.nmake b/Makefile.nmake index 1b411a74d5..5859a8c545 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.406 2004/02/22 08:30:41 ulfl Exp $ +# $Id: Makefile.nmake,v 1.407 2004/02/23 22:45:24 gerald Exp $ include config.nmake include <win32.mak> @@ -74,8 +74,10 @@ dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib epan\ethereal.lib \ wsock32.lib user32.lib \ wiretap\wiretap-$(WTAP_VERSION).lib \ $(GLIB_LIBS) \ + $(ADNS_LIBS) \ $(PCRE_LIBS) \ - $(ZLIB_LIBS) + $(ZLIB_LIBS) \ + $(NET_SNMP_DIR)\win32\lib\netsnmp.lib randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ user32.lib \ |