summaryrefslogtreecommitdiff
path: root/cpp/src/IcePatch2Lib
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/IcePatch2Lib
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/IcePatch2Lib')
-rw-r--r--cpp/src/IcePatch2Lib/Makefile12
-rwxr-xr-xcpp/src/IcePatch2Lib/Makefile.mak8
2 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/IcePatch2Lib/Makefile b/cpp/src/IcePatch2Lib/Makefile
index 5f4b6bd189e..5bf0339516a 100644
--- a/cpp/src/IcePatch2Lib/Makefile
+++ b/cpp/src/IcePatch2Lib/Makefile
@@ -9,16 +9,16 @@
top_srcdir = ../..
-LIBFILENAME = $(call mklibfilename,IcePatch2,$(VERSION))
-SONAME = $(call mksoname,IcePatch2,$(SOVERSION))
+LIBFILENAME = $(call mklibfilename,IcePatch2,$(VERSION))
+SONAME = $(call mksoname,IcePatch2,$(SOVERSION))
LIBNAME = $(call mklibname,IcePatch2)
-TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
+TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME))
-OBJS = Util.o \
- ClientUtil.o \
+OBJS = ClientUtil.o \
FileInfo.o \
- FileServer.o
+ FileServer.o \
+ Util.o
SRCS = $(OBJS:.o=.cpp)
diff --git a/cpp/src/IcePatch2Lib/Makefile.mak b/cpp/src/IcePatch2Lib/Makefile.mak
index 68c185edfc1..4acf5c612df 100755
--- a/cpp/src/IcePatch2Lib/Makefile.mak
+++ b/cpp/src/IcePatch2Lib/Makefile.mak
@@ -12,12 +12,12 @@ top_srcdir = ..\..
LIBNAME = $(top_srcdir)\lib\icepatch2$(LIBSUFFIX).lib
DLLNAME = $(top_srcdir)\bin\icepatch2$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-TARGETS = $(LIBNAME) $(DLLNAME)
+TARGETS = $(LIBNAME) $(DLLNAME)
-OBJS = Util.obj \
- ClientUtil.obj \
+OBJS = ClientUtil.obj \
FileInfo.obj \
- FileServer.obj
+ FileServer.obj \
+ Util.obj
SRCS = $(OBJS:.obj=.cpp)