diff options
-rw-r--r-- | Makefile.nmake | 126 | ||||
-rw-r--r-- | codecs/Makefile.nmake | 4 | ||||
-rw-r--r-- | doc/Makefile.nmake | 2 | ||||
-rw-r--r-- | epan/Makefile.nmake | 6 | ||||
-rw-r--r-- | epan/dfilter/Makefile.nmake | 4 | ||||
-rw-r--r-- | epan/dissectors/Makefile.nmake | 18 | ||||
-rw-r--r-- | epan/ftypes/Makefile.nmake | 2 | ||||
-rw-r--r-- | epan/wmem/Makefile.nmake | 2 | ||||
-rw-r--r-- | epan/wslua/Makefile.nmake | 2 | ||||
-rw-r--r-- | epan/wspython/Makefile.nmake | 2 | ||||
-rw-r--r-- | packaging/nsis/Makefile.nmake | 52 | ||||
-rw-r--r-- | packaging/portableapps/win32/Makefile.nmake | 14 | ||||
-rw-r--r-- | packaging/u3/tools/Makefile.nmake | 2 | ||||
-rw-r--r-- | packaging/u3/win32/Makefile.nmake | 16 | ||||
-rw-r--r-- | plugins/mate/Makefile.nmake | 2 | ||||
-rw-r--r-- | plugins/tpg/Makefile.nmake | 2 | ||||
-rw-r--r-- | tools/lemon/Makefile.nmake | 2 | ||||
-rw-r--r-- | wsutil/Makefile.nmake | 2 |
18 files changed, 130 insertions, 130 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 30b9ab7dfc..61989c1d9c 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -54,9 +54,9 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) PLATFORM_SRC = capture-wpcap.c capture_wpcap_packet.c capture_win_ifnames.c WTAP_PLUGIN_SOURCES = \ - epan/plugins.c \ - epan/report_err.c \ - epan/filesystem.c + epan/plugins.c \ + epan/report_err.c \ + epan/filesystem.c include Makefile.common @@ -202,7 +202,7 @@ all: $(LIBS_CHECK) config.h ui\qt\config.pri tools image codecs $(C_ARES_DLL) $( packaging: all cd packaging cd nsis - $(MAKE) /$(MAKEFLAGS) -f makefile.nmake + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. cd .. !ELSE @@ -216,7 +216,7 @@ packaging_u3: all cd packaging cd u3 cd win32 - $(MAKE) /$(MAKEFLAGS) -f makefile.nmake + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. cd .. cd .. @@ -225,7 +225,7 @@ packaging_papps: all cd packaging cd portableapps cd win32 - $(MAKE) /$(MAKEFLAGS) -f makefile.nmake + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. cd .. cd .. @@ -410,7 +410,7 @@ config.h : config.h.win32 config.nmake -e s/@VERSION_MICRO@/$(VERSION_MICRO)/ \ -e "s/@HAVE_C_ARES@/$(C_ARES_CONFIG)/" \ -e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" \ - -e "s/@HAVE_KFW@/$(KFW_CONFIG)/" \ + -e "s/@HAVE_KFW@/$(KFW_CONFIG)/" \ -e "s/@HAVE_NETTLE@/$(NETTLE_CONFIG)/" \ -e "s/@HAVE_LIBZ@/$(ZLIB_CONFIG)/" \ -e "s/@HAVE_LIBPCAP@/$(WINPCAP_CONFIG)/" \ @@ -826,7 +826,7 @@ REQUIRED_TOOLS=\ env \ grep \ --cygwinonly /usr/bin/find \ - peflags \ + peflags \ $(PERL) \ $(PYTHON) \ sed \ @@ -967,63 +967,63 @@ process_libs: # WHEN UPDATING LIBRARY VERSIONS, KEEP ALSO ONE FORMER VERSION SO # UPDATING REMOVES THE FORMER USER DIRS clean_setup: - cd "$(WIRESHARK_LIB_DIR)" - rm -r -f adns-1.0-win32-05ws - rm -r -f c-ares-1.5.3ws - rm -r -f c-ares-1.6.0ws - rm -r -f c-ares-1.7.0-win??ws - rm -r -f c-ares-1.7.1-win??ws - rm -r -f c-ares-1.9.1-1-win??ws - rm -r -f gettext-0.14.5 - rm -r -f gettext-runtime-0.17 - rm -r -f gettext-runtime-0.17-1 - rm -r -f gettext-0.17-1 # win64 - rm -r -f glib - rm -r -f gnutls-2.8.1-1 - rm -r -f gnutls-2.8.5-*-win??ws - rm -r -f gnutls-2.10.3-*-win??ws - rm -r -f gnutls-2.12.18-*-win??ws + cd "$(WIRESHARK_LIB_DIR)" + rm -r -f adns-1.0-win32-05ws + rm -r -f c-ares-1.5.3ws + rm -r -f c-ares-1.6.0ws + rm -r -f c-ares-1.7.0-win??ws + rm -r -f c-ares-1.7.1-win??ws + rm -r -f c-ares-1.9.1-1-win??ws + rm -r -f gettext-0.14.5 + rm -r -f gettext-runtime-0.17 + rm -r -f gettext-runtime-0.17-1 + rm -r -f gettext-0.17-1 # win64 + rm -r -f glib + rm -r -f gnutls-2.8.1-1 + rm -r -f gnutls-2.8.5-*-win??ws + rm -r -f gnutls-2.10.3-*-win??ws + rm -r -f gnutls-2.12.18-*-win??ws !IF "$(GTK_NAME)" == "gtk2" - rm -r -f gtk2 + rm -r -f gtk2 !ELSE - rm -r -f gtk3 -!ENDIF - rm -r -f gtk+ - rm -r -f gtk-wimp - rm -r -f kfw-2.5 - rm -r -f kfw-3-2-2-final - rm -r -f kfw-3.2.2-ws1 - rm -r -f kfw-3-2-2-i386-ws-vc6 - rm -r -f libiconv-1.9.1.bin.woe32 - rm -r -f lua5.1 - rm -r -f lua5.1.4 - rm -r -f libsmi-0.4.5 - rm -r -f libsmi-0.4.8 - rm -r -f libsmi-svn-40773-win??ws - rm -r -f nasm-2.00 - rm -r -f nasm-2.02 - rm -r -f nasm-2.09.08 - rm -r -f pcre-6.4 - rm -r -f pcre-7.0 - rm -r -f portaudio_v19 - rm -r -f portaudio_v19_2 - rm -r -f upx301w - rm -r -f upx303w - rm -r -f user-guide - rm -r -f zlib123 - rm -r -f zlib125 - rm -r -f zlib-1.2.5 - rm -r -f zlib123-dll - rm -r -f AirPcap_Devpack_1_0_0_594 - rm -r -f AirPcap_Devpack_4_0_0_1480 - rm -r -f AirPcap_Devpack_4_1_0_1622 - rm -r -f GeoIP-1.4.5ws - rm -r -f GeoIP-1.4.6-win??ws - rm -r -f GeoIP-1.4.8-win??ws - rm -r -f GeoIP-1.4.8-*-win??ws - rm -r -f WinSparkle-0.3-44-g2c8d9d3-win??ws - rm -r -f WpdPack - cd "$(MAKEDIR)" + rm -r -f gtk3 +!ENDIF + rm -r -f gtk+ + rm -r -f gtk-wimp + rm -r -f kfw-2.5 + rm -r -f kfw-3-2-2-final + rm -r -f kfw-3.2.2-ws1 + rm -r -f kfw-3-2-2-i386-ws-vc6 + rm -r -f libiconv-1.9.1.bin.woe32 + rm -r -f lua5.1 + rm -r -f lua5.1.4 + rm -r -f libsmi-0.4.5 + rm -r -f libsmi-0.4.8 + rm -r -f libsmi-svn-40773-win??ws + rm -r -f nasm-2.00 + rm -r -f nasm-2.02 + rm -r -f nasm-2.09.08 + rm -r -f pcre-6.4 + rm -r -f pcre-7.0 + rm -r -f portaudio_v19 + rm -r -f portaudio_v19_2 + rm -r -f upx301w + rm -r -f upx303w + rm -r -f user-guide + rm -r -f zlib123 + rm -r -f zlib125 + rm -r -f zlib-1.2.5 + rm -r -f zlib123-dll + rm -r -f AirPcap_Devpack_1_0_0_594 + rm -r -f AirPcap_Devpack_4_0_0_1480 + rm -r -f AirPcap_Devpack_4_1_0_1622 + rm -r -f GeoIP-1.4.5ws + rm -r -f GeoIP-1.4.6-win??ws + rm -r -f GeoIP-1.4.8-win??ws + rm -r -f GeoIP-1.4.8-*-win??ws + rm -r -f WinSparkle-0.3-44-g2c8d9d3-win??ws + rm -r -f WpdPack + cd "$(MAKEDIR)" ################################################################################ # Prepare the debug trees for running Wireshark/Tshark from there. diff --git a/codecs/Makefile.nmake b/codecs/Makefile.nmake index 3d76ded410..65158720cc 100644 --- a/codecs/Makefile.nmake +++ b/codecs/Makefile.nmake @@ -14,7 +14,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ $(CC) $(CFLAGS) -Fd.\ -c $< CODEC_OBJECTS= \ - G711udecode.obj \ + G711udecode.obj \ G711adecode.obj @@ -29,7 +29,7 @@ G711udecode.obj: G711u\G711udecode.c G711u\G711udecode.h G711u\G711utable.h $(CC) $(CFLAGS) -Fd.\ -c G711u\G711udecode.c /Fo%|fF.obj clean: - rm -f $(CODEC_OBJECTS) codecs.lib *.pdb *.sbr + rm -f $(CODEC_OBJECTS) codecs.lib *.pdb *.sbr distclean: clean diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake index fd05767583..a9662afb4a 100644 --- a/doc/Makefile.nmake +++ b/doc/Makefile.nmake @@ -50,7 +50,7 @@ AUTHORS-SHORT: ../AUTHORS make-authors-short.pl # the man page # AUTHORS-SHORT-FORMAT: AUTHORS-SHORT make-authors-format.pl - $(PERL) perlnoutf.pl make-authors-format.pl < AUTHORS-SHORT > AUTHORS-SHORT-FORMAT + $(PERL) perlnoutf.pl make-authors-format.pl < AUTHORS-SHORT > AUTHORS-SHORT-FORMAT ws.css: ../docbook/ws.css copy ..\docbook\ws.css . diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 95755d3bc3..86ac70ff00 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -111,7 +111,7 @@ libwireshark.lib: libwireshark.dll libwireshark.exp: libwireshark.dll libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) crypt ftypes dfilter wmem $(WSLUA_DIR) $(WSPYTHON_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib wmem/wmem.lib dissectors\dissectors.lib $(WSLUA_LIB) $(WSPYTHON_LIB) ..\image\libwireshark.res + crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib wmem/wmem.lib dissectors\dissectors.lib $(WSLUA_LIB) $(WSPYTHON_LIB) ..\image\libwireshark.res @echo Linking libwireshark.dll $(link) $(dlllflags) $(conlibsdll) shell32.lib \ $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ @@ -122,7 +122,7 @@ libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) crypt ftypes dfilter wmem $(EXTRA_OBJECTS) libwireshark.lib : ..\config.h $(LIBWIRESHARK_OBJECTS) crypt ftypes dfilter wmem $(WSLUA_DIR) $(WSPYTHON_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ - crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib wmem/wmem.lib $(WSLUA_LIB) $(WSPYTHON_LIB) dissectors\dissectors.lib + crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib wmem/wmem.lib $(WSLUA_LIB) $(WSPYTHON_LIB) dissectors\dissectors.lib link /lib /out:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \ $(EXTRA_OBJECTS) @@ -311,7 +311,7 @@ REASSEMBLE_TEST_LIBS= ..\wiretap\wiretap-$(WTAP_VERSION).lib \ reassemble_test.exe: $(REASSEMBLE_TEST_OBJ) @echo Linking $@ $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ - $(REASSEMBLE_TEST_LIBS) $(GLIB_LIBS) $(ZLIB_LIBS) $(REASSEMBLE_TEST_OBJ) + $(REASSEMBLE_TEST_LIBS) $(GLIB_LIBS) $(ZLIB_LIBS) $(REASSEMBLE_TEST_OBJ) !IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1 !ENDIF diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake index bc0c3e9dc5..eb2b45f6d1 100644 --- a/epan/dfilter/Makefile.nmake +++ b/epan/dfilter/Makefile.nmake @@ -21,7 +21,7 @@ GENERATED_CFLAGS=\ CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) .c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< + $(CC) $(CFLAGS) -Fd.\ -c $< OBJECTS=\ $(NONGENERATED_C_FILES:.c=.obj) \ @@ -73,7 +73,7 @@ grammar.c : $(LEMON)\lemon.exe $(LEMON)\lempar.c grammar.lemon $(LEMON)\lemon.exe: cd ../../tools - $(MAKE) /$(MAKEFLAGS) -f makefile.nmake lemon + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake lemon cd ../epan/dfilter checkapi: diff --git a/epan/dissectors/Makefile.nmake b/epan/dissectors/Makefile.nmake index 66866c3a47..b62c81a20b 100644 --- a/epan/dissectors/Makefile.nmake +++ b/epan/dissectors/Makefile.nmake @@ -17,7 +17,7 @@ CFLAGS= $(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ /I$(PCAP_DIR)\include .c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< + $(CC) $(CFLAGS) -Fd.\ -c $< DISSECTOR_OBJECTS = \ $(ALL_DISSECTORS_SRC:.c=.obj) @@ -30,16 +30,16 @@ dissectors.lib: register.obj packet-ncp2222.c $(GENERATED_HEADER_FILES) ../../co link /lib /out:dissectors.lib $(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS) !IF "$(MSVC_VARIANT)" != "MSVC2005" && \ - "$(MSVC_VARIANT)" != "MSVC2005EE" && \ - "$(MSVC_VARIANT)" != "MSVC2008" && \ - "$(MSVC_VARIANT)" != "MSVC2008EE" && \ - "$(MSVC_VARIANT)" != "MSVC2010" && \ - "$(MSVC_VARIANT)" != "MSVC2010EE" && \ - "$(MSVC_VARIANT)" != "MSVC2012" && \ - "$(MSVC_VARIANT)" != "MSVC2012EE" + "$(MSVC_VARIANT)" != "MSVC2005EE" && \ + "$(MSVC_VARIANT)" != "MSVC2008" && \ + "$(MSVC_VARIANT)" != "MSVC2008EE" && \ + "$(MSVC_VARIANT)" != "MSVC2010" && \ + "$(MSVC_VARIANT)" != "MSVC2010EE" && \ + "$(MSVC_VARIANT)" != "MSVC2012" && \ + "$(MSVC_VARIANT)" != "MSVC2012EE" # Disable debug for large dissectors packet-rrc.obj : packet-rrc.c - $(CC) $(CFLAGS) /Zd /Fd.\ -c $? + $(CC) $(CFLAGS) /Zd /Fd.\ -c $? !ENDIF # diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake index 5392545bdb..ec28e8ed65 100644 --- a/epan/ftypes/Makefile.nmake +++ b/epan/ftypes/Makefile.nmake @@ -14,7 +14,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ /I$(PCAP_DIR)\include -DWS_BUILD_DLL .c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< + $(CC) $(CFLAGS) -Fd.\ -c $< OBJECTS=$(NONGENERATED_C_FILES:.c=.obj) diff --git a/epan/wmem/Makefile.nmake b/epan/wmem/Makefile.nmake index ab26b9a2e0..8559256dda 100644 --- a/epan/wmem/Makefile.nmake +++ b/epan/wmem/Makefile.nmake @@ -36,7 +36,7 @@ WMEM_TEST_LIBS= wmem.lib wmem_test.exe: $(WMEM_TEST_OBJ) $(WMEM_TEST_LIBS) @echo Linking $@ link /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ - $(WMEM_TEST_LIBS) $(GLIB_LIBS) $(WMEM_TEST_OBJ) + $(WMEM_TEST_LIBS) $(GLIB_LIBS) $(WMEM_TEST_OBJ) wmem_test_install: set copycmd=/y diff --git a/epan/wslua/Makefile.nmake b/epan/wslua/Makefile.nmake index 1164061822..0898e94814 100644 --- a/epan/wslua/Makefile.nmake +++ b/epan/wslua/Makefile.nmake @@ -12,7 +12,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ /I$(PCAP_DIR)\include .c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< + $(CC) $(CFLAGS) -Fd.\ -c $< MODULES = \ lua_bitop.c \ diff --git a/epan/wspython/Makefile.nmake b/epan/wspython/Makefile.nmake index 6772f0fa51..67522e1157 100644 --- a/epan/wspython/Makefile.nmake +++ b/epan/wspython/Makefile.nmake @@ -12,7 +12,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ $(PYTHON_CFLAGS) -DWS_BUILD_DLL .c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< + $(CC) $(CFLAGS) -Fd.\ -c $< LIBWSPYTHON_OBJECTS = $(LIBWSPYTHON_SRC:.c=.obj) diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index b583b17d20..ebfd17ab77 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -126,54 +126,54 @@ NSIS_FLAGS=\ /DGTK_SCHEMAS_DIR=$(GTK_SCHEMAS_DIR) \ !ENDIF !IFDEF NEED_CAIRO_GOBJECT_DLL - /DNEED_CAIRO_GOBJECT_DLL=$(NEED_CAIRO_GOBJECT_DLL) \ + /DNEED_CAIRO_GOBJECT_DLL=$(NEED_CAIRO_GOBJECT_DLL) \ !ENDIF !IFDEF NEED_CAIRO_DLL - /DNEED_CAIRO_DLL=$(NEED_CAIRO_DLL) \ + /DNEED_CAIRO_DLL=$(NEED_CAIRO_DLL) \ !ENDIF !IFDEF NEED_EXPAT_DLL - /DNEED_EXPAT_DLL=$(NEED_EXPAT_DLL) \ - /DEXPAT_DLL=$(EXPAT_DLL) \ + /DNEED_EXPAT_DLL=$(NEED_EXPAT_DLL) \ + /DEXPAT_DLL=$(EXPAT_DLL) \ !ENDIF !IFDEF NEED_FFI_DLL - /DNEED_FFI_DLL=$(NEED_FFI_DLL) \ - /DFFI_DLL=$(FFI_DLL) \ + /DNEED_FFI_DLL=$(NEED_FFI_DLL) \ + /DFFI_DLL=$(FFI_DLL) \ !ENDIF !IFDEF NEED_FONTCONFIG_DLL - /DNEED_FONTCONFIG_DLL=$(NEED_FONTCONFIG_DLL) \ - /DFONTCONFIG_DLL=$(FONTCONFIG_DLL) \ + /DNEED_FONTCONFIG_DLL=$(NEED_FONTCONFIG_DLL) \ + /DFONTCONFIG_DLL=$(FONTCONFIG_DLL) \ !ENDIF !IFDEF NEED_FREETYPE_DLL - /DNEED_FREETYPE_DLL=$(NEED_FREETYPE_DLL) \ - /DFREETYPE_DLL=$(FREETYPE_DLL) \ + /DNEED_FREETYPE_DLL=$(NEED_FREETYPE_DLL) \ + /DFREETYPE_DLL=$(FREETYPE_DLL) \ !ENDIF !IFDEF NEED_JASPER_DLL - /DNEED_JASPER_DLL=$(NEED_JASPER_DLL) \ - /DJASPER_DLL=$(JASPER_DLL) \ + /DNEED_JASPER_DLL=$(NEED_JASPER_DLL) \ + /DJASPER_DLL=$(JASPER_DLL) \ !ENDIF !IFDEF NEED_JPEG_DLL - /DNEED_JPEG_DLL=$(NEED_JPEG_DLL) \ - /DJPEG_DLL=$(JPEG_DLL) \ + /DNEED_JPEG_DLL=$(NEED_JPEG_DLL) \ + /DJPEG_DLL=$(JPEG_DLL) \ !ENDIF !IFDEF NEED_LZMA_DLL - /DNEED_LZMA_DLL=$(NEED_LZMA_DLL) \ - /DLZMA_DLL=$(LZMA_DLL) \ + /DNEED_LZMA_DLL=$(NEED_LZMA_DLL) \ + /DLZMA_DLL=$(LZMA_DLL) \ !ENDIF !IFDEF NEED_PIXMAN_DLL - /DNEED_PIXMAN_DLL=$(NEED_PIXMAN_DLL) \ - /DPIXMAN_DLL=$(PIXMAN_DLL) \ + /DNEED_PIXMAN_DLL=$(NEED_PIXMAN_DLL) \ + /DPIXMAN_DLL=$(PIXMAN_DLL) \ !ENDIF !IFDEF NEED_PNG_DLL - /DNEED_PNG_DLL=$(NEED_PNG_DLL) \ - /DPNG_DLL=$(PNG_DLL) \ + /DNEED_PNG_DLL=$(NEED_PNG_DLL) \ + /DPNG_DLL=$(PNG_DLL) \ !ENDIF !IFDEF NEED_TIFF_DLL - /DNEED_TIFF_DLL=$(NEED_TIFF_DLL) \ - /DTIFF_DLL=$(TIFF_DLL) \ + /DNEED_TIFF_DLL=$(NEED_TIFF_DLL) \ + /DTIFF_DLL=$(TIFF_DLL) \ !ENDIF !IFDEF NEED_XML_DLL - /DNEED_XML_DLL=$(NEED_XML_DLL) \ - /DXML_DLL=$(XML_DLL) \ + /DNEED_XML_DLL=$(NEED_XML_DLL) \ + /DXML_DLL=$(XML_DLL) \ !ENDIF !ENDIF /DINTL_DLL=$(INTL_DLL) \ @@ -243,12 +243,12 @@ maintainer-clean: distclean $(DOC): cd ../../doc - $(MAKE) /$(MAKEFLAGS) -f makefile.nmake + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd ../packaging/nsis $(EXE) $(DLL): cd ../.. - $(MAKE) /$(MAKEFLAGS) -f makefile.nmake + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd packaging/nsis #### diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake index 5ee848380e..61056d65d8 100644 --- a/packaging/portableapps/win32/Makefile.nmake +++ b/packaging/portableapps/win32/Makefile.nmake @@ -27,7 +27,7 @@ COPY_FLAGS = /d /y WIN32_SETUP_OPT=--download !ENDIF !IF EXIST("..\..\wireshark-qt-release\qtshark.exe") -QT_DIR="..\..\wireshark-qt-release" +QT_DIR="..\..\wireshark-qt-release" !ENDIF UPX_FLAGS = -q @@ -54,7 +54,7 @@ nsis-bits: $(WSMANIFEST): cd ../.. - $(MAKE) /$(MAKEFLAGS) -f makefile.nmake wireshark.manifest + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake wireshark.manifest cd portableapps/win32 distribution.nmake: makenmake.pl $(WSMANIFEST) ../../ws-manifest.pl @@ -76,13 +76,13 @@ pack: distribution appinfo.ini: appinfo.tmpl $(TOPDIR)\config.nmake sed -e 's/$$(PAPPS_VERSION)/$(PAPPS_VERSION)/g' \ - -e 's/$$(VERSION_MAJOR)/$(VERSION_MAJOR)/g' \ - -e 's/$$(VERSION_MINOR)/$(VERSION_MINOR)/g' \ + -e 's/$$(VERSION_MAJOR)/$(VERSION_MAJOR)/g' \ + -e 's/$$(VERSION_MINOR)/$(VERSION_MINOR)/g' \ < appinfo.tmpl > appinfo.ini WiresharkPortable.ini: WiresharkPortable.tmpl $(TOPDIR)\config.nmake sed -e 's/$$(PCAP_VERSION)/$(PCAP_VERSION)/g' \ - -e 's/$$(TARGET_MACHINE)/$(TARGET_MACHINE)/g' \ + -e 's/$$(TARGET_MACHINE)/$(TARGET_MACHINE)/g' \ < WiresharkPortable.tmpl > WiresharkPortable.ini appinfo: appinfo.ini @@ -123,14 +123,14 @@ Files/WiresharkPortable.exe : WiresharkPortable.nsi findprocdll clean: cd ../../ - $(MAKE) -f makefile.nmake $@ + $(MAKE) -f Makefile.nmake $@ cd portableapps/win32 rm -rf $(FILES) rm -rf appinfo.ini rm -rf WiresharkPortable.ini rm -rf distribution.nmake rm -rf WiresharkPortable-$(VERSION).paf.exe - rm -rf *~ *.*~ + rm -rf *~ *.*~ distclean: clean rm -rf WiresharkPortable-*.paf.exe diff --git a/packaging/u3/tools/Makefile.nmake b/packaging/u3/tools/Makefile.nmake index a3b0cc270c..10574a37bb 100644 --- a/packaging/u3/tools/Makefile.nmake +++ b/packaging/u3/tools/Makefile.nmake @@ -36,7 +36,7 @@ clean: rm -rf libgcrypt-11.dll libgpg-error-0.dll rm -rf state nodeid rm -rf *.pdb - rm -rf *~ *.*~ + rm -rf *~ *.*~ distclean: clean diff --git a/packaging/u3/win32/Makefile.nmake b/packaging/u3/win32/Makefile.nmake index b17424d7a1..4a9cf08544 100644 --- a/packaging/u3/win32/Makefile.nmake +++ b/packaging/u3/win32/Makefile.nmake @@ -33,19 +33,19 @@ all: package uuid.sed: $(TOPDIR)\config.nmake cd $(TOOLSDIR) - $(MAKE) /$(MAKEFLAGS) -f makefile.nmake + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd ..\win32 $(TOOLSDIR)\utest.exe "$(VERSION)" > $@ manifest.u3i: manifest.tmpl uuid.sed sed -e 's/$$(U3_VERSION)/$(U3_VERSION)/g' \ - -e 's/$$(VERSION)/$(VERSION)/g' \ + -e 's/$$(VERSION)/$(VERSION)/g' \ #ifdef UPX -e 's/$$(SIZE)/50/g' \ #else -e 's/$$(SIZE)/65/g' \ #endif - -f uuid.sed < manifest.tmpl > manifest.u3i + -f uuid.sed < manifest.tmpl > manifest.u3i u3-dirs: if not exist $(HOST) $(MKDIR) $(HOST) @@ -61,7 +61,7 @@ nsis-bits: $(WSMANIFEST): cd ../.. - $(MAKE) /$(MAKEFLAGS) -f makefile.nmake wireshark.manifest + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake wireshark.manifest cd u3/win32 distribution.nmake: makenmake.pl $(WSMANIFEST) ../../ws-manifest.pl @@ -78,7 +78,7 @@ verify-tools: !IFDEF UPX @if not exist $(UPX) echo Error: $(UPX) not found. &&\ echo Either: &&\ -echo a) run 'nmake -f makefile.nmake setup' at the toplevel; or &&\ +echo a) run 'nmake -f Makefile.nmake setup' at the toplevel; or &&\ echo b) comment out UPX in config.nmake at the top level, to build without compressing the dlls and exes \ && exit 2 !endif @@ -114,10 +114,10 @@ u3util.exe: u3util.obj ../../../config.nmake clean: cd ../tools - $(MAKE) -f makefile.nmake $@ + $(MAKE) -f Makefile.nmake $@ cd ../win32 cd ../../ - $(MAKE) -f makefile.nmake $@ + $(MAKE) -f Makefile.nmake $@ cd u3/win32 rm -rf manifest.u3i rm -rf uuid.sed @@ -129,7 +129,7 @@ clean: rm -rf u3util.{exe,obj,pdb} rm -rf wireshark-$(VERSION).u3p rm -rf distribution.nmake - rm -rf *~ *.*~ + rm -rf *~ *.*~ distclean: clean rm -rf wireshark*.u3p diff --git a/plugins/mate/Makefile.nmake b/plugins/mate/Makefile.nmake index 3d291f782f..f16846b0b2 100644 --- a/plugins/mate/Makefile.nmake +++ b/plugins/mate/Makefile.nmake @@ -147,7 +147,7 @@ mate_grammar.c : mate_grammar.lemon $(LEMON)\lemon.exe $(LEMON)\lemon.exe: cd ../../tools - $(MAKE) /$(MAKEFLAGS) -f makefile.nmake lemon + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake lemon cd ../plugins/mate checkapi: diff --git a/plugins/tpg/Makefile.nmake b/plugins/tpg/Makefile.nmake index ae64ff59ad..1ca0327a40 100644 --- a/plugins/tpg/Makefile.nmake +++ b/plugins/tpg/Makefile.nmake @@ -62,7 +62,7 @@ mate_grammar.c : mate_grammar.lemon $(LEMON)\lemon.exe $(LEMON)\lemon.exe: cd ../../tools - $(MAKE) /$(MAKEFLAGS) -f makefile.nmake lemon + $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake lemon cd ../plugins/mate checkapi: diff --git a/tools/lemon/Makefile.nmake b/tools/lemon/Makefile.nmake index 3b321102b6..d629ec4008 100644 --- a/tools/lemon/Makefile.nmake +++ b/tools/lemon/Makefile.nmake @@ -8,7 +8,7 @@ include ..\..\config.nmake CFLAGS=$(WARNINGS_ARE_ERRORS) -I..\..\ $(LOCAL_CFLAGS) .c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< + $(CC) $(CFLAGS) -Fd.\ -c $< all : lemon.exe diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake index 503c7713bb..63f999955f 100644 --- a/wsutil/Makefile.nmake +++ b/wsutil/Makefile.nmake @@ -16,7 +16,7 @@ CFLAGS=$(WARNINGS_ARE_ERRORS) $(STANDARD_CFLAGS) \ /I$(PCAP_DIR)\include -DWS_BUILD_DLL .c.obj:: - $(CC) $(CFLAGS) -Fd.\ -c $< + $(CC) $(CFLAGS) -Fd.\ -c $< # For use when making libwsutil.dll libwsutil_LIBS = $(GLIB_LIBS) |