Fix tabs and spaces

LICENSE

@@ -1,13 +1,13 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -56,8 +56,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -111,7 +111,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -169,7 +169,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -226,7 +226,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -256,7 +256,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -278,9 +278,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it

Makefile

@@ -33,7 +33,7 @@ $(eval $(call make-global-rule,install,$(languages)))
 install:: install-doc install-slice
 
 $(eval $(call install-data-files,$(wildcard $(slicedir)/*/*.ice),$(slicedir),$(install_slicedir),\
-	install-slice,"Installing slice files"))
+        install-slice,"Installing slice files"))
 
 $(eval $(call install-data-files,$(wildcard $(top_srcdir)/*LICENSE),$(top_srcdir),$(install_docdir),\
-	install-doc,"Installing documentation files"))
+        install-doc,"Installing documentation files"))

config/Make.rules

@@ -8,7 +8,7 @@
 # Select an installation base directory. The directory will be created
 # if it does not exist.
 #
-prefix			?= /opt/Ice-$(version)
+prefix                  ?= /opt/Ice-$(version)
 
 #
 # The "root directory" for runpath embedded in executables. Can be set
@@ -23,13 +23,13 @@ prefix			?= /opt/Ice-$(version)
 # Define embedded_runpath as no if you don't want any runpath added to
 # the executables. If not set, defaults to to "yes"
 #
-embedded_runpath 	?= yes
+embedded_runpath        ?= yes
 
 #
 # Define OPTIMIZE as yes if you want to build with optimization.
 # Otherwise Ice is build with debug information.
 #
-#OPTIMIZE		= yes
+#OPTIMIZE               = yes
 
 #
 # Define PLATFORMS to the list of platforms to build. This defaults
@@ -38,7 +38,7 @@ embedded_runpath 	?= yes
 # Run `make print V=supported-platforms' to see the list of supported
 # platforms on this system.
 #
-PLATFORMS              	?= $(firstword $(supported-platforms))
+PLATFORMS               ?= $(firstword $(supported-platforms))
 
 #
 # Configurations to build. This defaults to the first supported
@@ -47,7 +47,7 @@ PLATFORMS              	?= $(firstword $(supported-platforms))
 # Run `make print V=supported-configs` to see the list of supported
 # configurations.
 #
-CONFIGS			?= $(firstword $(supported-configs))
+CONFIGS                 ?= $(firstword $(supported-configs))
 
 #
 # Third-party libraries
@@ -56,43 +56,43 @@ CONFIGS			?= $(firstword $(supported-configs))
 # where the compiler can find it, set the corresponding variable
 # below to the installation directory of the library.
 #
-#DB_HOME 		?= /opt/db
-#EXPAT_HOME 		?= /opt/expat
-#BZ2_HOME 		?= /opt/bz2
-#MCPP_HOME 		?= /opt/mcpp
+#DB_HOME                ?= /opt/db
+#EXPAT_HOME             ?= /opt/expat
+#BZ2_HOME               ?= /opt/bz2
+#MCPP_HOME              ?= /opt/mcpp
 
 # ----------------------------------------------------------------------
 # Don't change anything below this line!
 # ----------------------------------------------------------------------
 
-os			?= $(shell uname)
+os                      ?= $(shell uname)
 
-include	$(top_srcdir)/ice/config/Make.rules.$(os)
-include	$(top_srcdir)/ice/config/Make.project.rules
-include	$(top_srcdir)/ice/config/Make.tests.rules
+include $(top_srcdir)/ice/config/Make.rules.$(os)
+include $(top_srcdir)/ice/config/Make.project.rules
+include $(top_srcdir)/ice/config/Make.tests.rules
 
 -include $(top_srcdir)/config/Make.rules.$(os)
 
 ifeq ($(USE_BIN_DIST),yes)
-prefix 			:= $(or $(ICE_HOME),$(if $(filter Darwin,$(os)),/usr/local,/usr))
-bindir			?= $(install_bindir)
-libdir			?= $(install_libdir)
-slicedir 		?= $(install_slicedir)
-includedir		?= $(install_includedir)
+prefix                  := $(or $(ICE_HOME),$(if $(filter Darwin,$(os)),/usr/local,/usr))
+bindir                  ?= $(install_bindir)
+libdir                  ?= $(install_libdir)
+slicedir                ?= $(install_slicedir)
+includedir              ?= $(install_includedir)
 else
-bindir			?= $(call mappingdir,$(or $1,$(currentdir)),bin)
-libdir			?= $(call mappingdir,$(or $1,$(currentdir)),lib)
-slicedir		?= $(top_srcdir)/slice
-includedir		?= $(call mappingdir,$(or $1,$(currentdir)),include)
-
-ice_bindir		?= $(top_srcdir)/ice/cpp/bin
-ice_libdir		?= $(top_srcdir)/ice/cpp/lib
-ice_slicedir 		?= $(top_srcdir)/ice/slice
-ice_includedir		?= $(top_srcdir)/ice/cpp/include
+bindir                  ?= $(call mappingdir,$(or $1,$(currentdir)),bin)
+libdir                  ?= $(call mappingdir,$(or $1,$(currentdir)),lib)
+slicedir                ?= $(top_srcdir)/slice
+includedir              ?= $(call mappingdir,$(or $1,$(currentdir)),include)
+
+ice_bindir              ?= $(top_srcdir)/ice/cpp/bin
+ice_libdir              ?= $(top_srcdir)/ice/cpp/lib
+ice_slicedir            ?= $(top_srcdir)/ice/slice
+ice_includedir          ?= $(top_srcdir)/ice/cpp/include
 endif
 
-version			= 3.7.0
-soversion		= 37
+version                 = 3.7.0
+soversion               = 37
 
 #
 # The compatversion is the lowest patch release with the same API.
@@ -102,31 +102,31 @@ soversion		= 37
 #
 compatversion           = $(version)
 
-ice_src_dist 		:= $(wildcard $(ice_home)/config/Make.rules)
+ice_src_dist            := $(wildcard $(ice_home)/config/Make.rules)
 
-usr_dir_install		:= $(filter /usr%,$(prefix))
-install_bindir	  	?= $(prefix)/bin
-install_libdir	  	?= $(prefix)/lib
-install_slicedir 	?= $(prefix)$(if $(usr_dir_install),/share/Ice-$(version))/slice
-install_includedir	?= $(prefix)/include
-install_docdir 		?= $(prefix)$(if $(usr_dir_install),/share/Ice-$(version))
-install_mandir		?= $(prefix)$(if $(usr_dir_install),/share)/man
+usr_dir_install         := $(filter /usr%,$(prefix))
+install_bindir          ?= $(prefix)/bin
+install_libdir          ?= $(prefix)/lib
+install_slicedir        ?= $(prefix)$(if $(usr_dir_install),/share/Ice-$(version))/slice
+install_includedir      ?= $(prefix)/include
+install_docdir          ?= $(prefix)$(if $(usr_dir_install),/share/Ice-$(version))
+install_mandir          ?= $(prefix)$(if $(usr_dir_install),/share)/man
 
 #
 # Languages, platforms and configurations to build
 #
-supported-languages	= cpp java
-supported-configs	= shared
+supported-languages     = cpp java
+supported-configs       = shared
 
 #
 # Support for 3rd party libraries
 #
-thirdparties		:= bz2 db expat mcpp
-bz2_home 		:= $(BZ2_HOME)
-db_home 		:= $(or $(DB_HOME),$(if $(filter Darwin,$(os)),/usr/local/opt/berkeley-db53,))
-db_ldflags		:= -ldb_cxx
-expat_home 		:= $(EXPAT_HOME)
-mcpp_home		:= $(MCPP_HOME)
+thirdparties            := bz2 db expat mcpp
+bz2_home                := $(BZ2_HOME)
+db_home                 := $(or $(DB_HOME),$(if $(filter Darwin,$(os)),/usr/local/opt/berkeley-db53,))
+db_ldflags              := -ldb_cxx
+expat_home              := $(EXPAT_HOME)
+mcpp_home               := $(MCPP_HOME)
 
 $(foreach l,$(thirdparties),$(eval $(call make-lib,$l)))
 
@@ -136,12 +136,12 @@ db_libdir               ?= $(wildcard /usr/lib64/db53)
 #
 # Support for Ice libraries
 #
-static_projects		= %
-shared_excludes		= IceUtil Slice
+static_projects         = %
+shared_excludes         = IceUtil Slice
 
 $(eval $(call load-dependencies,$(addprefix $(top_srcdir)/ice/cpp/src/,IceUtil Slice Ice IceXML)))
 
 # Create component dependency variables
-ice_targetdir 			:= $(top_srcdir)/ice/cpp/lib
+ice_targetdir                   := $(top_srcdir)/ice/cpp/lib
 $(foreach d,$(dependencies),$(eval $(call create-component-targets,ice,$d,library)))
 

cpp/Makefile

@@ -4,8 +4,8 @@
 #
 # **********************************************************************
 
-top_srcdir 	:= ..
-lang_srcdir	:= $(top_srcdir)/cpp
+top_srcdir      := ..
+lang_srcdir     := $(top_srcdir)/cpp
 
 include $(top_srcdir)/config/Make.rules
 include $(lang_srcdir)/config/Make.rules

cpp/config/Make.rules

@@ -8,12 +8,12 @@
 # Don't change anything below this line!
 # ----------------------------------------------------------------------
 
--include	$(lang_srcdir)/config/Make.rules.$(os)
+-include        $(lang_srcdir)/config/Make.rules.$(os)
 
 #
 # Supported configurations
 #
-supported-configs	= shared static
+supported-configs       = shared static
 
 slice2cpp_targetext     = cpp
 slice2cpp_path          = $(ice_bindir)/slice2cpp
@@ -38,7 +38,7 @@ $2_sources += $$(addprefix $$($1_generated_srcdir)/,$$(addsuffix .cpp,$$($2_slic
 $2_generated_includedir := $$(or $$($2_generated_includedir),$$($1_generated_includedir))
 
 $$(foreach d,$$($2_slice2freeze),$$(if $$($2_$$d),$$(eval $$(call make-slice2freeze,$$d,$$($2_$$d),\
-	$$($2_$$d_slice),$$($2_generated_includedir),$$($1_generated_srcdir),$$($2_$$d_flags) $$($2_sliceflags)))))
+        $$($2_$$d_slice),$$($2_generated_includedir),$$($1_generated_srcdir),$$($2_$$d_flags) $$($2_sliceflags)))))
 
 $2_generated_headers += $$(foreach d,$$($2_slice2freeze),$$(if $$($2_$$d),$$($2_generated_includedir)/$$d.h))
 $1_generated += $$(foreach d,$$($2_slice2freeze),$$(if $$($2_$$d),$$($2_generated_includedir)/$$d.h))
@@ -56,7 +56,7 @@ define make-freeze-project
 ifneq ($$($1_slice2freeze),)
 
 $$(foreach d,$$($1_slice2freeze),$$(eval $$(call make-slice2freeze,$$d,$$($1_$$d),\
-	$$($1_$$d_slice),$$($1_generated_includedir),$$($1_generated_srcdir),$$($1_$$d_flags) $$($1_sliceflags))))
+        $$($1_$$d_slice),$$($1_generated_includedir),$$($1_generated_srcdir),$$($1_$$d_flags) $$($1_sliceflags))))
 
 $1_generated += $$(foreach d,$$($1_slice2freeze),$$($1_generated_includedir)/$$d.h)
 
@@ -77,15 +77,15 @@ ifeq ($(USE_BIN_DIST),yes)
 else
 ifneq ($(filter ../ice/%,$1),)
 # Building ice submodule project
-$1_cppflags 		+= -I../ice/cpp/include -I../ice/cpp/include/generated -I../ice/cpp/src
+$1_cppflags             += -I../ice/cpp/include -I../ice/cpp/include/generated -I../ice/cpp/src
 else
 # Building freeze project
-$1_slicecompiler 	:= slice2cpp
-$1_sliceflags		+= -I$(ice_slicedir) -I$(slicedir)
-$1_cppflags 		+= -I$(ice_includedir) -I$(includedir) -I$1/generated -I../ice/cpp/src -Isrc
-$1_cppflags		+= -I$(ice_includedir)/generated -I$(includedir)/generated
-$1_extensions		:= make-freeze-project
-$1_component_extensions	:= make-freeze-components
+$1_slicecompiler        := slice2cpp
+$1_sliceflags           += -I$(ice_slicedir) -I$(slicedir)
+$1_cppflags             += -I$(ice_includedir) -I$(includedir) -I$1/generated -I../ice/cpp/src -Isrc
+$1_cppflags             += -I$(ice_includedir)/generated -I$(includedir)/generated
+$1_extensions           := make-freeze-project
+$1_component_extensions := make-freeze-components
 endif
 $(make-project)
 srcs:: $1
@@ -96,14 +96,14 @@ endef
 # $(call make-cpp-test-project,$1=project)
 #
 define make-cpp-test-project
-$1_slicecompiler 	:= slice2cpp
-$1_sliceflags		+= -I$(ice_slicedir) -I$(slicedir) -I$1
-$1_cppflags		+= -I$(ice_includedir) -I$(includedir) -I$1/generated -Itest/include -I$1
+$1_slicecompiler        := slice2cpp
+$1_sliceflags           += -I$(ice_slicedir) -I$(slicedir) -I$1
+$1_cppflags             += -I$(ice_includedir) -I$(includedir) -I$1/generated -Itest/include -I$1
 ifneq ($(USE_BIN_DIST),yes)
 $1_cppflags             += -I$(ice_includedir)/generated -I$(includedir)/generated
 endif
-$1_extensions		:= make-freeze-project
-$1_component_extensions	:= make-freeze-components
+$1_extensions           := make-freeze-project
+$1_component_extensions := make-freeze-components
 $(make-project)
 tests:: $1
 endef
@@ -112,23 +112,23 @@ endef
 # $(create-cpp-test-project $1=test)
 #
 define create-cpp-test-project
-$1_srcext		:= cpp
-$1_dependencies 	:= $$(or $$($1_dependencies),Freeze Ice)
+$1_srcext               := cpp
+$1_dependencies         := $$(or $$($1_dependencies),Freeze Ice)
 $(create-test-project)
 endef
 
 #
 # $(call make-cpp-demo-project,$1=project)
 #
 define make-cpp-demo-project
-$1_slicecompiler 	:= slice2cpp
-$1_sliceflags		+= -I$(ice_slicedir) -I$(slicedir) -I$1
-$1_cppflags		+= -I$(ice_includedir) -I$(includedir) -I$1/generated -I$1
+$1_slicecompiler        := slice2cpp
+$1_sliceflags           += -I$(ice_slicedir) -I$(slicedir) -I$1
+$1_cppflags             += -I$(ice_includedir) -I$(includedir) -I$1/generated -I$1
 ifneq ($(USE_BIN_DIST),yes)
 $1_cppflags             += -I$(ice_includedir)/generated -I$(includedir)/generated
 endif
-$1_extensions		:= make-freeze-project
-$1_component_extensions	:= make-freeze-components
+$1_extensions           := make-freeze-project
+$1_component_extensions := make-freeze-components
 $(make-project)
 demos:: $1
 endef
@@ -137,8 +137,8 @@ endef
 # $(create-cpp-demo-project $1=demo)
 #
 define create-cpp-demo-project
-$1_srcext		:= cpp
-$1_dependencies 	:= $$(or $$($1_dependencies),Freeze Ice)
+$1_srcext               := cpp
+$1_dependencies         := $$(or $$($1_dependencies),Freeze Ice)
 $(create-test-project)
 endef