summaryrefslogtreecommitdiff
path: root/cpp/src/IceBox
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2014-08-22 14:38:33 -0230
committerJoe George <joe@zeroc.com>2014-08-22 14:38:33 -0230
commitdaf8d59b70e788b9e34a7894ec6a933b6779e209 (patch)
tree334ad636f545a5ac563ecc284f541689731b37f0 /cpp/src/IceBox
parentJS build fixes (diff)
downloadice-daf8d59b70e788b9e34a7894ec6a933b6779e209.tar.bz2
ice-daf8d59b70e788b9e34a7894ec6a933b6779e209.tar.xz
ice-daf8d59b70e788b9e34a7894ec6a933b6779e209.zip
Sort C++ Demo and src makefiles
Diffstat (limited to 'cpp/src/IceBox')
-rw-r--r--cpp/src/IceBox/Makefile16
-rw-r--r--cpp/src/IceBox/Makefile.mak10
2 files changed, 13 insertions, 13 deletions
diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile
index 1766096fc62..7649c773d4c 100644
--- a/cpp/src/IceBox/Makefile
+++ b/cpp/src/IceBox/Makefile
@@ -9,21 +9,21 @@
top_srcdir = ../..
-LIBFILENAME = $(call mklibfilename,IceBox,$(VERSION))
-SONAME = $(call mksoname,IceBox,$(SOVERSION))
+LIBFILENAME = $(call mklibfilename,IceBox,$(VERSION))
+SONAME = $(call mksoname,IceBox,$(SOVERSION))
LIBNAME = $(call mklibname,IceBox)
SERVER = $(bindir)/icebox
ADMIN = $(bindir)/iceboxadmin
-LIBTARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
-TARGETS = $(LIBTARGETS) $(SERVER) $(ADMIN)
+LIBTARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
+TARGETS = $(LIBTARGETS) $(SERVER) $(ADMIN)
-OBJS = IceBox.o \
- Exception.o
+OBJS = Exception.o \
+ IceBox.o
-SOBJS = ServiceManagerI.o \
- Service.o
+SOBJS = Service.o \
+ ServiceManagerI.o
AOBJS = Admin.o
diff --git a/cpp/src/IceBox/Makefile.mak b/cpp/src/IceBox/Makefile.mak
index 35d36715299..6ba4449e6ad 100644
--- a/cpp/src/IceBox/Makefile.mak
+++ b/cpp/src/IceBox/Makefile.mak
@@ -19,13 +19,13 @@ SERVER = $(top_srcdir)\bin\icebox$(LIBSUFFIX).exe
ADMIN = $(top_srcdir)\bin\iceboxadmin.exe
-TARGETS = $(LIBNAME) $(DLLNAME) $(SERVER) $(ADMIN)
+TARGETS = $(LIBNAME) $(DLLNAME) $(SERVER) $(ADMIN)
-OBJS = IceBox.obj \
- Exception.obj
+OBJS = Exception.obj \
+ IceBox.obj
-SOBJS = ServiceManagerI.obj \
- Service.obj
+SOBJS = Service.obj \
+ ServiceManagerI.obj
AOBJS = Admin.obj