diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-05-28 18:04:30 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-05-28 23:43:46 +0000 |
| commit | bb78e8f6e5bf770f1effbc84c44656436add5a5d (patch) | |
| tree | d34d4df68f16ae9495c8407241dc3ab89343fd08 /epan/Makefile.nmake | |
| parent | 56d8ff67904af95fe3178faf774c0dfd3c076bdf (diff) | |
Add Modelines and use tabs and fix typo
Change-Id: Ie3f60f66f0f4a572098d1d7425c53aaf51bdb747
Reviewed-on: https://code.wireshark.org/review/1846
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 7d8eb2f2b9..2db7127d3c 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -110,7 +110,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 psapi.lib \ $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ @@ -121,7 +121,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) @@ -364,15 +364,15 @@ exntest_install: tvbtest_install: set copycmd=/y - if exist tvbtest.exe xcopy tvbtest.exe ..\$(INSTALL_DIR) /d + if exist tvbtest.exe xcopy tvbtest.exe ..\$(INSTALL_DIR) /d oids_test_install: set copycmd=/y - if exist oids_test.exe xcopy oids_test.exe ..\$(INSTALL_DIR) /d + if exist oids_test.exe xcopy oids_test.exe ..\$(INSTALL_DIR) /d reassemble_test_install: set copycmd=/y - if exist reassemble_test.exe xcopy reassemble_test.exe ..\$(INSTALL_DIR) /d + if exist reassemble_test.exe xcopy reassemble_test.exe ..\$(INSTALL_DIR) /d # @@ -449,3 +449,16 @@ ps.c: ..\tools\rdps.py print.ps checkapi: $(PERL) ../tools/checkAPIs.pl -g termoutput -build $(LIBWIRESHARK_SRC) + +# +# Editor modelines - http://www.wireshark.org/tools/modelines.html +# +# Local variables: +# c-basic-offset: 8 +# tab-width: 8 +# indent-tabs-mode: t +# End: +# +# vi: set shiftwidth=8 tabstop=8 noexpandtab: +# :indentSize=8:tabSize=8:noTabs=false: +# |