summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2015-04-13 18:37:28 +0200
committerBenoit Foucher <benoit@zeroc.com>2015-04-13 18:37:28 +0200
commite305d33203086236280fe918072398918f87d6f4 (patch)
tree91e3d323f699af35a0477ea935a6569d4a290dcf /cpp/src
parentAdd MCPP_HOME for Windows build. (diff)
downloadice-e305d33203086236280fe918072398918f87d6f4.tar.bz2
ice-e305d33203086236280fe918072398918f87d6f4.tar.xz
ice-e305d33203086236280fe918072398918f87d6f4.zip
Fixed Makefile indentation to use tab witdh=8 and indent width = 4
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Freeze/Makefile2
-rw-r--r--cpp/src/FreezeScript/Makefile2
-rw-r--r--cpp/src/Ice/Makefile2
-rw-r--r--cpp/src/IceGrid/Makefile2
-rw-r--r--cpp/src/IceGrid/Makefile.mak4
-rw-r--r--cpp/src/IceSSL/Makefile12
-rw-r--r--cpp/src/IceStorm/Makefile6
-rw-r--r--cpp/src/IceXML/Makefile4
-rw-r--r--cpp/src/IceXML/Makefile.mak2
-rw-r--r--cpp/src/Makefile74
10 files changed, 55 insertions, 55 deletions
diff --git a/cpp/src/Freeze/Makefile b/cpp/src/Freeze/Makefile
index 8b017532e20..a1f0d151f28 100644
--- a/cpp/src/Freeze/Makefile
+++ b/cpp/src/Freeze/Makefile
@@ -15,7 +15,7 @@ LIBNAME = $(call mklibname,Freeze)
TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
-SLICE_OBJS = BackgroundSaveEvictor.o \
+SLICE_OBJS = BackgroundSaveEvictor.o \
CatalogData.o \
Connection.o \
ConnectionF.o \
diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile
index b69cb80721d..cd25fd9f481 100644
--- a/cpp/src/FreezeScript/Makefile
+++ b/cpp/src/FreezeScript/Makefile
@@ -25,7 +25,7 @@ COMMON_OBJS = AssignVisitor.o \
Util.o \
Grammar.o
-TRANSFORM_OBJS = TransformAnalyzer.o \
+TRANSFORM_OBJS = TransformAnalyzer.o \
TransformVisitor.o \
Transformer.o \
transformdb.o
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index e6f133ca4f9..8d2fca43101 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -54,7 +54,7 @@ SLICE_OBJS = BuiltinSequences.o \
SliceChecksumDict.o \
Version.o
-OBJS = Acceptor.o \
+OBJS = Acceptor.o \
ACM.o \
Application.o \
AsyncResult.o \
diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile
index 33ed98f7a81..14da8e051d9 100644
--- a/cpp/src/IceGrid/Makefile
+++ b/cpp/src/IceGrid/Makefile
@@ -16,7 +16,7 @@ REGISTRY_SERVER = $(bindir)/icegridregistry
TARGETS = $(NODE_SERVER) $(REGISTRY_SERVER) $(ADMIN)
SLICE_OBJS = Internal.o \
- IceLocatorDiscovery.o
+ IceLocatorDiscovery.o
ADMIN_OBJS = Client.o \
DescriptorBuilder.o \
diff --git a/cpp/src/IceGrid/Makefile.mak b/cpp/src/IceGrid/Makefile.mak
index 32ddf0acc2a..c9a2bdc68a7 100644
--- a/cpp/src/IceGrid/Makefile.mak
+++ b/cpp/src/IceGrid/Makefile.mak
@@ -17,8 +17,8 @@ NODE_SERVER_R = $(top_srcdir)\bin\icegridnode.exe
NODE_SERVER = $(top_srcdir)\bin\icegridnode$(LIBSUFFIX).exe
-REGISTRY_SERVER_D = $(top_srcdir)\bin\icegridregistryd.exe
-REGISTRY_SERVER_R = $(top_srcdir)\bin\icegridregistry.exe
+REGISTRY_SERVER_D = $(top_srcdir)\bin\icegridregistryd.exe
+REGISTRY_SERVER_R = $(top_srcdir)\bin\icegridregistry.exe
REGISTRY_SERVER = $(top_srcdir)\bin\icegridregistry$(LIBSUFFIX).exe
diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile
index 61b3f92d3aa..e6439145991 100644
--- a/cpp/src/IceSSL/Makefile
+++ b/cpp/src/IceSSL/Makefile
@@ -33,17 +33,17 @@ OBJS = AcceptorI.o \
ifneq ($(findstring MINGW,$(shell uname)),)
OBJS := $(OBJS) \
- SChannelEngine.o \
- SChannelTransceiverI.o
+ SChannelEngine.o \
+ SChannelTransceiverI.o
else
ifeq ($(shell uname),Darwin)
OBJS := $(OBJS) \
- SecureTransportEngine.o \
- SecureTransportTransceiverI.o
+ SecureTransportEngine.o \
+ SecureTransportTransceiverI.o
else
OBJS := $(OBJS) \
- OpenSSLEngine.o \
- OpenSSLTransceiverI.o
+ OpenSSLEngine.o \
+ OpenSSLTransceiverI.o
endif
endif
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index d382aa6b4f5..2e83e626554 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -9,9 +9,9 @@
top_srcdir = ../..
-LIBFILENAME = $(call mklibfilename,IceStormService,$(VERSION))
-SONAME = $(call mksoname,IceStormService,$(SOVERSION))
-LIBNAME = $(call mklibname,IceStormService)
+LIBFILENAME = $(call mklibfilename,IceStormService,$(VERSION))
+SONAME = $(call mksoname,IceStormService,$(SOVERSION))
+LIBNAME = $(call mklibname,IceStormService)
ADMIN = $(bindir)/icestormadmin
MIGRATE = $(bindir)/icestormmigrate
diff --git a/cpp/src/IceXML/Makefile b/cpp/src/IceXML/Makefile
index a15cc4df501..70230eff513 100644
--- a/cpp/src/IceXML/Makefile
+++ b/cpp/src/IceXML/Makefile
@@ -8,9 +8,9 @@
# **********************************************************************
top_srcdir = ../..
-
+
LIBFILENAME = $(call mklibfilename,IceXML,$(VERSION))
-SONAME = $(call mksoname,IceXML,$(SOVERSION))
+SONAME = $(call mksoname,IceXML,$(SOVERSION))
LIBNAME = $(call mklibname,IceXML)
TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME))
diff --git a/cpp/src/IceXML/Makefile.mak b/cpp/src/IceXML/Makefile.mak
index 328a3f9a9bb..9ec88f5786b 100644
--- a/cpp/src/IceXML/Makefile.mak
+++ b/cpp/src/IceXML/Makefile.mak
@@ -8,7 +8,7 @@
# **********************************************************************
top_srcdir = ..\..
-
+
LIBNAME = $(top_srcdir)\lib\icexml$(LIBSUFFIX).lib
DLLNAME = $(top_srcdir)\bin\icexml$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
diff --git a/cpp/src/Makefile b/cpp/src/Makefile
index 56178276555..e99d90d50b5 100644
--- a/cpp/src/Makefile
+++ b/cpp/src/Makefile
@@ -13,49 +13,49 @@ include $(top_srcdir)/config/Make.rules
ifneq ($(findstring MINGW,$(UNAME)),)
SUBDIRS = IceUtil \
- Slice \
- slice2cpp \
- slice2rb \
- Ice \
- IceSSL \
- IceDiscovery \
- IceLocatorDiscovery
+ Slice \
+ slice2cpp \
+ slice2rb \
+ Ice \
+ IceSSL \
+ IceDiscovery \
+ IceLocatorDiscovery
else
SUBDIRS = IceUtil \
- Slice \
- slice2cpp \
- slice2cs \
- slice2freeze \
- slice2freezej \
- slice2java \
- slice2php \
- slice2py \
- slice2rb \
- slice2html \
- slice2js
+ Slice \
+ slice2cpp \
+ slice2cs \
+ slice2freeze \
+ slice2freezej \
+ slice2java \
+ slice2php \
+ slice2py \
+ slice2rb \
+ slice2html \
+ slice2js
ifeq ($(UNAME),Darwin)
- SUBDIRS := $(SUBDIRS) slice2objc
+ SUBDIRS := $(SUBDIRS) slice2objc
endif
- SUBDIRS := $(SUBDIRS) \
- Ice \
- IceXML \
- IceSSL \
- IceDiscovery \
- IceLocatorDiscovery \
- Freeze \
- FreezeScript \
- IceBox \
- Glacier2Lib \
- Glacier2CryptPermissionsVerifier \
- Glacier2 \
- IcePatch2Lib \
- IcePatch2 \
- IceStormLib \
- IceGridLib \
- IceStorm \
- IceGrid
+ SUBDIRS := $(SUBDIRS) \
+ Ice \
+ IceXML \
+ IceSSL \
+ IceDiscovery \
+ IceLocatorDiscovery \
+ Freeze \
+ FreezeScript \
+ IceBox \
+ Glacier2Lib \
+ Glacier2CryptPermissionsVerifier \
+ Glacier2 \
+ IcePatch2Lib \
+ IcePatch2 \
+ IceStormLib \
+ IceGridLib \
+ IceStorm \
+ IceGrid
endif
.PHONY: $(EVERYTHING) $(SUBDIRS)