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

svn path=/trunk/; revision=50140

4 files changed, 42 insertions, 42 deletions

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