summaryrefslogtreecommitdiff
path: root/cpp/src/IceDiscovery
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/IceDiscovery
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/IceDiscovery')
-rw-r--r--cpp/src/IceDiscovery/Makefile6
-rw-r--r--cpp/src/IceDiscovery/Makefile.mak4
2 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IceDiscovery/Makefile b/cpp/src/IceDiscovery/Makefile
index 517932511a5..f63a76d92b4 100644
--- a/cpp/src/IceDiscovery/Makefile
+++ b/cpp/src/IceDiscovery/Makefile
@@ -10,14 +10,14 @@
top_srcdir = ../..
LIBFILENAME = $(call mklibfilename,IceDiscovery,$(VERSION))
-SONAME = $(call mksoname,IceDiscovery,$(SOVERSION))
+SONAME = $(call mksoname,IceDiscovery,$(SOVERSION))
LIBNAME = $(call mklibname,IceDiscovery)
TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
-OBJS = LocatorI.o \
+OBJS = IceDiscovery.o \
+ LocatorI.o \
LookupI.o \
- IceDiscovery.o \
PluginI.o
SRCS = $(OBJS:.o=.cpp)
diff --git a/cpp/src/IceDiscovery/Makefile.mak b/cpp/src/IceDiscovery/Makefile.mak
index 2247c0424ad..8f1d45d9515 100644
--- a/cpp/src/IceDiscovery/Makefile.mak
+++ b/cpp/src/IceDiscovery/Makefile.mak
@@ -14,9 +14,9 @@ DLLNAME = $(top_srcdir)\bin\icediscovery$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).d
TARGETS = $(LIBNAME) $(DLLNAME)
-OBJS = LocatorI.obj \
+OBJS = IceDiscovery.obj \
+ LocatorI.obj \
LookupI.obj \
- IceDiscovery.obj \
PluginI.obj
SRCS = $(OBJS:.obj=.cpp)