diff options
Diffstat (limited to 'objective-c/src')
| -rw-r--r-- | objective-c/src/Glacier2/Makefile | 14 | ||||
| -rw-r--r-- | objective-c/src/Ice/Makefile | 116 | ||||
| -rw-r--r-- | objective-c/src/IceGrid/Makefile | 20 | ||||
| -rw-r--r-- | objective-c/src/IceSSL/Makefile | 4 | ||||
| -rw-r--r-- | objective-c/src/IceStorm/Makefile | 4 |
5 files changed, 79 insertions, 79 deletions
diff --git a/objective-c/src/Glacier2/Makefile b/objective-c/src/Glacier2/Makefile index dd942e510f2..e9e67bc09d1 100644 --- a/objective-c/src/Glacier2/Makefile +++ b/objective-c/src/Glacier2/Makefile @@ -15,13 +15,13 @@ LIBNAME = $(call mklibname,Glacier2ObjC) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) -SLICE_OBJS = Metrics.o \ - PermissionsVerifierF.o \ - PermissionsVerifier.o \ - Router.o \ - RouterF.o \ - Session.o \ - SSLInfo.o +SLICE_OBJS = Metrics.o \ + PermissionsVerifierF.o \ + PermissionsVerifier.o \ + Router.o \ + RouterF.o \ + Session.o \ + SSLInfo.o OBJS = $(SLICE_OBJS) diff --git a/objective-c/src/Ice/Makefile b/objective-c/src/Ice/Makefile index 5e61fb797a5..50fd9aa6425 100644 --- a/objective-c/src/Ice/Makefile +++ b/objective-c/src/Ice/Makefile @@ -16,66 +16,66 @@ LIBNAME = $(call mklibname,IceObjC$(libsuffix)) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) SLICE_OBJS = BuiltinSequences.o \ - Communicator.o \ - CommunicatorF.o \ - Connection.o \ - ConnectionF.o \ - Current.o \ - Endpoint.o \ - EndpointF.o \ - EndpointTypes.o \ - FacetMap.o \ - Identity.o \ - InstrumentationF.o \ - ImplicitContext.o \ - ImplicitContextF.o \ - Locator.o \ - LocatorF.o \ - LocalException.o \ - Logger.o \ - LoggerF.o \ - Metrics.o \ - ObjectAdapter.o \ - ObjectAdapterF.o \ - ObjectFactoryF.o \ - PluginF.o \ - Process.o \ - ProcessF.o \ - Properties.o \ - PropertiesF.o \ - PropertiesAdmin.o \ - RemoteLogger.o \ - Router.o \ - RouterF.o \ - ServantLocator.o \ - ServantLocatorF.o \ - SliceChecksumDict.o \ - Version.o + Communicator.o \ + CommunicatorF.o \ + Connection.o \ + ConnectionF.o \ + Current.o \ + Endpoint.o \ + EndpointF.o \ + EndpointTypes.o \ + FacetMap.o \ + Identity.o \ + InstrumentationF.o \ + ImplicitContext.o \ + ImplicitContextF.o \ + Locator.o \ + LocatorF.o \ + LocalException.o \ + Logger.o \ + LoggerF.o \ + Metrics.o \ + ObjectAdapter.o \ + ObjectAdapterF.o \ + ObjectFactoryF.o \ + PluginF.o \ + Process.o \ + ProcessF.o \ + Properties.o \ + PropertiesF.o \ + PropertiesAdmin.o \ + RemoteLogger.o \ + Router.o \ + RouterF.o \ + ServantLocator.o \ + ServantLocatorF.o \ + SliceChecksumDict.o \ + Version.o OBJC_OBJS = DispatchInterceptor.o \ - Request.o \ - $(SLICE_OBJS) + Request.o \ + $(SLICE_OBJS) OBJCXX_OBJS = BatchRequestInterceptor.o \ - CommunicatorI.o \ - ConnectionI.o \ - CurrentI.o \ - EndpointI.o \ - Exception.o \ - Dispatcher.o \ - IdentityI.o \ - ImplicitContextI.o \ - Initialize.o \ - LocalObject.o \ - LoggerI.o \ - Object.o \ - ObjectAdapterI.o \ - PropertiesI.o \ - Proxy.o \ - Stream.o \ - SlicedData.o \ - Util.o \ - VersionI.o + CommunicatorI.o \ + ConnectionI.o \ + CurrentI.o \ + EndpointI.o \ + Exception.o \ + Dispatcher.o \ + IdentityI.o \ + ImplicitContextI.o \ + Initialize.o \ + LocalObject.o \ + LoggerI.o \ + Object.o \ + ObjectAdapterI.o \ + PropertiesI.o \ + Proxy.o \ + Stream.o \ + SlicedData.o \ + Util.o \ + VersionI.o OBJS := $(OBJC_OBJS) $(OBJCXX_OBJS) @@ -84,9 +84,9 @@ SDIR = $(slicedir)/Ice include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I. -I$(ice_cpp_dir)/include -DICE_API_EXPORTS $(CPPFLAGS) +CPPFLAGS := -I. -I$(ice_cpp_dir)/include -DICE_API_EXPORTS $(CPPFLAGS) SLICE2OBJCFLAGS := --ice --include-dir objc/Ice --dll-export ICE_API $(SLICE2OBJCFLAGS) -LINKWITH := $(BASELIBS) +LINKWITH := $(BASELIBS) $(libdir)/$(LIBFILENAME): $(OBJS) rm -f $@ diff --git a/objective-c/src/IceGrid/Makefile b/objective-c/src/IceGrid/Makefile index 6aca248fa09..a3b42c83892 100644 --- a/objective-c/src/IceGrid/Makefile +++ b/objective-c/src/IceGrid/Makefile @@ -16,16 +16,16 @@ LIBNAME = $(call mklibname,IceGridObjC) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) SLICE_OBJS = Admin.o \ - Descriptor.o \ - Exception.o \ - FileParser.o \ - Locator.o \ - Observer.o \ - PluginFacade.o \ - Query.o \ - Registry.o \ - Session.o \ - UserAccountMapper.o + Descriptor.o \ + Exception.o \ + FileParser.o \ + Locator.o \ + Observer.o \ + PluginFacade.o \ + Query.o \ + Registry.o \ + Session.o \ + UserAccountMapper.o OBJS = $(SLICE_OBJS) diff --git a/objective-c/src/IceSSL/Makefile b/objective-c/src/IceSSL/Makefile index d25103405a1..52682acb491 100644 --- a/objective-c/src/IceSSL/Makefile +++ b/objective-c/src/IceSSL/Makefile @@ -16,10 +16,10 @@ LIBNAME = $(call mklibname,IceSSLObjC) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) SLICE_OBJS = EndpointInfo.o \ - ConnectionInfo.o + ConnectionInfo.o OBJCXX_OBJS = EndpointInfoI.o \ - ConnectionInfoI.o + ConnectionInfoI.o OBJS = $(SLICE_OBJS) $(OBJCXX_OBJS) diff --git a/objective-c/src/IceStorm/Makefile b/objective-c/src/IceStorm/Makefile index 1c55d69ffae..9d915e567ba 100644 --- a/objective-c/src/IceStorm/Makefile +++ b/objective-c/src/IceStorm/Makefile @@ -15,8 +15,8 @@ LIBNAME = $(call mklibname,IceStormObjC) TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)/$(LIBNAME)) -SLICE_OBJS = Metrics.o \ - IceStorm.o +SLICE_OBJS = Metrics.o \ + IceStorm.o OBJS = $(SLICE_OBJS) |