makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.

svn path=/trunk/; revision=50140

1 files changed, 63 insertions, 63 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.