diff options
95 files changed, 936 insertions, 936 deletions
diff --git a/config/Make.project.rules b/config/Make.project.rules index e3aab56a543..02c6589a21a 100644 --- a/config/Make.project.rules +++ b/config/Make.project.rules @@ -31,34 +31,34 @@ build-platform := $(or $(build-platform),$(firstword $(supported-platfo # component-platforms = $(call unique,$(foreach p,$(platforms),\ $(if $(and $(if $(filter $($p_excludes),$1 $2),,true),\ - $(or $(filter $($p_components),$2),\ - $(filter $(or $($p_projects),$(if $($p_components),,%)),$1))),\ - $(strip $p)))) + $(or $(filter $($p_components),$2),\ + $(filter $(or $($p_projects),$(if $($p_components),,%)),$1))),\ + $(strip $p)))) # # Same as the above but for configurations # -component-configs = $(call unique,$(foreach c,$(configs),\ - $(if $(strip $(foreach s,$(subst -,$(space),$c),\ - $(if $(and $(if $(filter $($s_excludes),$1 $2),,true),\ - $(or $(filter $($s_components),$2),\ - $(filter $($s_projects),$1))),,$s))),,\ - $(strip $c)))) +component-configs = $(call unique,$(foreach c,$(configs),\ + $(if $(strip $(foreach s,$(subst -,$(space),$c),\ + $(if $(and $(if $(filter $($s_excludes),$1 $2),,true),\ + $(or $(filter $($s_components),$2),\ + $(filter $($s_projects),$1))),,$s))),,\ + $(strip $c)))) # # Some variables for utilities # -INSTALL = cp -fp -MV = mv -f -RM = rm -f -MKDIR = mkdir -CHMOD = chmod +INSTALL = cp -fp +MV = mv -f +RM = rm -f +MKDIR = mkdir +CHMOD = chmod -Q := $(if $(V),,@) -E := $(if $(V),@:,@echo) +Q := $(if $(V),,@) +E := $(if $(V),@:,@echo) # $(call install-data,$1=filename,$2=srcdir,$3=destdist) -install-data = $(INSTALL) $2/$1 $(DESTDIR)$3/$1; $(CHMOD) a+r $(DESTDIR)$(3)/$(1) +install-data = $(INSTALL) $2/$1 $(DESTDIR)$3/$1; $(CHMOD) a+r $(DESTDIR)$(3)/$(1) # # $(call install-data-files,$1=files,$2=$srcdir,$3=$destdir,$4=target,$5=text-output) @@ -82,7 +82,7 @@ endef # # $(call make-objects,$1=srcdir,$2=generateddir,$3=objdir,$4=sources,$5=dependencies,$6=cppflags,$7=generatedext, -# $8=platform,$9=config) +# $8=platform,$9=config) # # Defines pattern rules to build object files into directory objdir. The sources # are specified by sources. The srcdir and generateddir specifies where the @@ -204,7 +204,7 @@ endef # # $(call make-static-library,$1=libname,$2=libdir,$3=version,$4=soversion,$5=objects,$6=dependencies,$7=ldflags, -# $8=platform,$9=config) +# $8=platform,$9=config) # # Defines rules for building the static library <libname> in <libdir> with the objects <objects> # @@ -274,9 +274,9 @@ endef # $(call get-shared-library-targets,$1=libname,$2=libdir,$3=version,$4=soversion) get-shared-library-targets = $(addprefix $2/,\ - $(call mkshlibfilename,$1,$3,$4) \ - $(if $(and $4,$(filter-out undefined,$(origin mksoname))),$(call mksoname,$1,$3,$4)) \ - $(if $(and $3,$(filter-out undefined,$(origin mkshlibname))),$(call mkshlibname,$1,$3,$4))) + $(call mkshlibfilename,$1,$3,$4) \ + $(if $(and $4,$(filter-out undefined,$(origin mksoname))),$(call mksoname,$1,$3,$4)) \ + $(if $(and $3,$(filter-out undefined,$(origin mkshlibname))),$(call mkshlibname,$1,$3,$4))) # # $(call make-shared-module,$1=libname,$2=libdir,$3=version,$4=soversion,$5=objects,$6=dependencies,$7=ldflags, @@ -304,7 +304,7 @@ get-shared-module-targets = $2/$1 # # $(call make-program,$1=exename,$2=bindir,$3=version,$4=soversion,$5=objects,$6=dependencies,$7=ldflags,\ - $8=platform,$9=config) + $8=platform,$9=config) # # Defines a rule for building the program <exename> in <bindir> with the objects <objects> # @@ -334,33 +334,33 @@ get-program-targets = $2/$1$(EXE_EXT) # define create-component-with-config-targets -$5_component := $2 -$5_platform := $3 -$5_config := $4 -$2_components := $5 +$5_component := $2 +$5_platform := $3 +$5_config := $4 +$2_components := $5 # # Compute the target and installation directories. # -$5_targetdir := $$(call var-value,targetdir,$1,$2,$3,$4,make-dirwsuffix) +$5_targetdir := $$(call var-value,targetdir,$1,$2,$3,$4,make-dirwsuffix) ifndef $1_noinstall -$5_installdir := $$(call var-value,installdir,$1,$2,$3,$4,make-dirwsuffix) +$5_installdir := $$(call var-value,installdir,$1,$2,$3,$4,make-dirwsuffix) endif # # Compute the target rule and name for this platform/configuration combination. # -$5_targetrule := $$(call var-value,target,$1,$2,$3,$4,make-targetrule) -$5_targetname := $$(call var-value,targetname,$1,$2,$3,$4,make-targetname) -$5_version := $$(call var-value,version,$1,$2,$3,$4) -$5_soversion := $$(call var-value,soversion,$1,$2,$3,$4) +$5_targetrule := $$(call var-value,target,$1,$2,$3,$4,make-targetrule) +$5_targetname := $$(call var-value,targetname,$1,$2,$3,$4,make-targetname) +$5_version := $$(call var-value,version,$1,$2,$3,$4) +$5_soversion := $$(call var-value,soversion,$1,$2,$3,$4) # # Transform the dependencies to [platform-configuration] specific dependencies. # $5_dependencies := $$(call var-rcompound,dependencies,$1,$2,$3,$4,make-deps) -$5_libs := $$(call var-compound,libs,$1,$2,$3,$4,make-unique) -$5_system_libs := $$(call var-compound,system_libs,$1,$2,$3,$4) +$5_libs := $$(call var-compound,libs,$1,$2,$3,$4,make-unique) +$5_system_libs := $$(call var-compound,system_libs,$1,$2,$3,$4) # # The targets to build @@ -384,18 +384,18 @@ endef # define create-component-targets -$2_project := $1 +$2_project := $1 -$2_target := $$(call var-with-default,$2_target,$3) -$2_targetname := $$(call var-with-default,$2_targetname,$(patsubst $1_%,%,$2)) +$2_target := $$(call var-with-default,$2_target,$3) +$2_targetname := $$(call var-with-default,$2_targetname,$(patsubst $1_%,%,$2)) -$2_platforms := $$(filter $(platforms) $$($2_always_enable_platforms),$$(call unique,$$($2_always_enable_platforms) $$(or $$($2_platforms),$$($1_platforms),$(call component-platforms,$1,$2)))) -$2_configs := $$(filter $(configs) $$($2_always_enable_configs),$$(call unique,$$($2_always_enable_configs) $$(or $$($2_configs),$$($1_configs),$(call component-configs,$1,$2)))) +$2_platforms := $$(filter $(platforms) $$($2_always_enable_platforms),$$(call unique,$$($2_always_enable_platforms) $$(or $$($2_platforms),$$($1_platforms),$(call component-platforms,$1,$2)))) +$2_configs := $$(filter $(configs) $$($2_always_enable_configs),$$(call unique,$$($2_always_enable_configs) $$(or $$($2_configs),$$($1_configs),$(call component-configs,$1,$2)))) # # The installation directory (install_bindir if program, install_libdir otherwise) # -$2_installdir := $$(or $$($2_installdir),$$(if $$(filter program,$$($2_target)),$(install_bindir),$(install_libdir))) +$2_installdir := $$(or $$($2_installdir),$$(if $$(filter program,$$($2_target)),$(install_bindir),$(install_libdir))) $$(foreach p,$$($2_platforms),\ $$(foreach c,$$(filter $$(or $$($$p_configs),%),$$($2_configs)),\ @@ -413,9 +413,9 @@ endef # define create-project-targets ifeq ($(filter $(SKIP),$1),) -$1_targetdir := $$(call var-with-default,$1_targetdir,$1/build) -$1_version := $$(call var-with-default,$1_version,$(version)) -$1_soversion := $$(call var-with-default,$1_soversion,$(soversion)) +$1_targetdir := $$(call var-with-default,$1_targetdir,$1/build) +$1_version := $$(call var-with-default,$1_version,$(version)) +$1_soversion := $$(call var-with-default,$1_soversion,$(soversion)) $$(foreach p,$$($1_programs),$$(if $$(filter $(SKIP),$$p),,$$(eval $$(call create-component-targets,$1,$$p,program)))) $$(foreach l,$$($1_libraries),$$(if $$(filter $(SKIP),$$l),,$$(eval $$(call create-component-targets,$1,$$l,library)))) endif @@ -431,8 +431,8 @@ define make-component-with-config # # Compute the compiler/linker flags. # -$5_cppflags := $$(call var-compound,cppflags,$1,$2,$3,$4,make-flags) -$5_ldflags := $$(call var-compound,ldflags,$1,$2,$3,$4,make-flags) +$5_cppflags := $$(call var-compound,cppflags,$1,$2,$3,$4,make-flags) +$5_ldflags := $$(call var-compound,ldflags,$1,$2,$3,$4,make-flags) # # If component specific cppflags are set and multiple components are configured for @@ -441,19 +441,19 @@ $5_ldflags := $$(call var-compound,ldflags,$1,$2,$3,$4,make-flags) # Compute the path of the object directory and add it to the project's # list of object directories. # -$5_objdir := $$(call var-value,objdir,$1,$2,$3,$4,make-dirwsuffix) +$5_objdir := $$(call var-value,objdir,$1,$2,$3,$4,make-dirwsuffix) $5_objdir := $$($5_objdir)$$(if $$(and $$($1_multicomp),\ - $$(filter-out $$(call var-compound,cppflags,$1,,$3,$4,make-flags),$$($5_cppflags))),/$$($2_targetname)) -$1_objdirs += $$($5_objdir) + $$(filter-out $$(call var-compound,cppflags,$1,,$3,$4,make-flags),$$($5_cppflags))),/$$($2_targetname)) +$1_objdirs += $$($5_objdir) -$5_sources := $$(patsubst $(lang_srcdir)/%,%,$$(call unique,$$(call var-compound,extra_sources,$1,$2,$3,$4) \ - $$(call var-compound,sources,$1,$2,$3,$4))) -$5_sources := $$(filter-out $$(patsubst $(lang_srcdir)/%,%,$$(call var-compound,excludes,$1,$2,$3,$4)),$$($5_sources)) +$5_sources := $$(patsubst $(lang_srcdir)/%,%,$$(call unique,$$(call var-compound,extra_sources,$1,$2,$3,$4) \ + $$(call var-compound,sources,$1,$2,$3,$4))) +$5_sources := $$(filter-out $$(patsubst $(lang_srcdir)/%,%,$$(call var-compound,excludes,$1,$2,$3,$4)),$$($5_sources)) # # Computes the list of objects to build based on the sources. # -$5_objects := $$(call unique,$$(addprefix $$($5_objdir)/,$$(call source-to-object,$$($5_sources)))) +$5_objects := $$(call unique,$$(addprefix $$($5_objdir)/,$$(call source-to-object,$$($5_sources)))) ifneq ($$($1_component_with_config_extensions),) $$(foreach e,$$($1_component_with_config_extensions),$$(eval $$(call $$e,$1,$2,$3,$4,$5))) @@ -469,13 +469,13 @@ $$($5_objdir)/$$(call source-to-dependency,$$($5_sources)): | $$($5_objdir) # Object rules # $$(foreach d,$$(call files-to-dirs,$$($5_sources)),$$(eval $$(call make-objects,$$d,$$($1_generated_srcdir),\ - $$($5_objdir),$$($5_sources),$$($5_dependencies),$$($5_cppflags),$$($$($1_slicecompiler)_targetext),$3,$4))) + $$($5_objdir),$$($5_sources),$$($5_dependencies),$$($5_cppflags),$$($$($1_slicecompiler)_targetext),$3,$4))) # # Target rule # $$(eval $$(call make-$$($5_targetrule),$$($5_targetname),$$($5_targetdir),$$($5_version),$$($5_soversion),\ - $$($5_objects),$$($5_dependencies),$$($5_ldflags),$3,$4)) + $$($5_objects),$$($5_dependencies),$$($5_ldflags),$3,$4)) # # component[platform-config]_* specific targets @@ -540,20 +540,20 @@ $1_sliceflags := $$($1_sliceflags) $$($2_sliceflags) $2_sliceflags := endif -$2_install_platforms := $$(or $$($2_install_platforms),$$($1_install_platforms),$$($2_platforms)) -$2_install_configs := $$(or $$($2_install_configs),$$($1_install_configs),$$($2_configs)) +$2_install_platforms := $$(or $$($2_install_platforms),$$($1_install_platforms),$$($2_platforms)) +$2_install_configs := $$(or $$($2_install_configs),$$($1_install_configs),$$($2_configs)) # # The source directory can be set at the component or project level. # -$2_srcdir := $$(or $$($2_srcdir),$$($1_srcdir)) +$2_srcdir := $$(or $$($2_srcdir),$$($1_srcdir)) # # Combine settings set at the project and component levels. # -$2_sliceflags := $$($2_sliceflags) $$($1_sliceflags) -$2_bisonflags := $$($2_bisonflags) $$($1_bisonflags) -$2_flexflags := $$($2_flexflags) $$($1_flexflags) +$2_sliceflags := $$($2_sliceflags) $$($1_sliceflags) +$2_bisonflags := $$($2_bisonflags) $$($1_bisonflags) +$2_flexflags := $$($2_flexflags) $$($1_flexflags) # # If we're compiling a library, we check for a ../slice/<component> directory. @@ -561,14 +561,14 @@ $2_flexflags := $$($2_flexflags) $$($1_flexflags) # generate the headers in include/<component>. # ifeq ($3,library) -$2_slicedir := $$(or $$($2_slicedir),$$(if $$(wildcard $(slicedir)/$2/*.ice),$(slicedir)/$2)) -$2_includedir := $$(or $$($2_includedir),$$(if $$(wildcard $(includedir)/$2/*.h),$(includedir)/$2)) +$2_slicedir := $$(or $$($2_slicedir),$$(if $$(wildcard $(slicedir)/$2/*.ice),$(slicedir)/$2)) +$2_includedir := $$(or $$($2_includedir),$$(if $$(wildcard $(includedir)/$2/*.h),$(includedir)/$2)) ifneq ($$(filter $(includedir)/%,$$($2_includedir)),) # Generate headers in include/generated sub-directory instead of the include directory -$2_generated_includedir := $$(patsubst $(includedir)/%,$(includedir)/generated/%,$$($2_includedir)) +$2_generated_includedir := $$(patsubst $(includedir)/%,$(includedir)/generated/%,$$($2_includedir)) else -$2_generated_includedir := $$(or $$($2_generated_includedir),$$($1_generated_includedir)) +$2_generated_includedir := $$(or $$($2_generated_includedir),$$($1_generated_includedir)) endif endif @@ -578,26 +578,26 @@ endif # the source directory and eventualy the slice directory if set. # ifeq ($$($2_sources),) -$2_sources := $$(foreach e,$(source-extensions),$$(wildcard $$($2_srcdir)/*.$$(e))) +$2_sources := $$(foreach e,$(source-extensions),$$(wildcard $$($2_srcdir)/*.$$(e))) ifneq ($$($2_slicedir),) $2_sources += $$(wildcard $$($2_slicedir)/*.ice) endif endif -$2_sources := $$(filter-out $$(patsubst $(lang_srcdir)/%,%,$$($2_excludes)),$$($2_sources)) +$2_sources := $$(filter-out $$(patsubst $(lang_srcdir)/%,%,$$($2_excludes)),$$($2_sources)) # # Compute the list of slice files from the sources and gather the location # of the slice files. # -$2_slices := $$(filter %.ice,$$($2_sources)) -$2_slicedirs := $$(call files-to-dirs,$$($2_slices),ice) +$2_slices := $$(filter %.ice,$$($2_sources)) +$2_slicedirs := $$(call files-to-dirs,$$($2_slices),ice) # # Append the slice directories and slice files which are not in the # slice/<component> directory to the project slice directories and # list of slice files. # -$1_slicedirs += $$(filter-out $$($2_slicedir),$$($2_slicedirs)) +$1_slicedirs += $$(filter-out $$($2_slicedir),$$($2_slicedirs)) $1_slices += $$(filter-out $$($2_slicedir)/%,$$($2_slices)) # @@ -615,7 +615,7 @@ $$($2_generated_includedir): endif $$(eval $$(call make-slices,$$($2_slicedir),$$($1_generated_srcdir),$$($2_generated_includedir),$$($2_slices),\ - $$($2_sliceflags),$$($1_slicecompiler))) + $$($2_sliceflags),$$($1_slicecompiler))) $2_generated_headers := $$(call generated-to-header,$$(filter $$($2_slicedir)/%,$$($2_sources))) $2_generated_headers := $$(addprefix $$($2_generated_includedir)/,$$($2_generated_headers)) @@ -638,7 +638,7 @@ endif $$(foreach p,$$($2_platforms),\ $$(foreach c,$$(filter $$(or $$($$p_configs),%),$$($2_configs)),\ $$(if $$(filter $(SKIP),$2[$$p-$$c]),,\ - $$(eval $$(call make-component-with-config,$1,$2,$$p,$$c,$2[$$p-$$c]))))) + $$(eval $$(call make-component-with-config,$1,$2,$$p,$$c,$2[$$p-$$c]))))) # # Component targets to build the component with the specified platforms/configurations @@ -676,17 +676,17 @@ endef # define make-project ifeq ($(filter $(SKIP),$1),) -$1_objdir := $$(or $$($1_objdir),$1/build) -$1_srcdir := $$(or $$($1_srcdir),$1) -$1_generated_srcdir := $$(or $$($1_generated_srcdir),$1/generated) +$1_objdir := $$(or $$($1_objdir),$1/build) +$1_srcdir := $$(or $$($1_srcdir),$1) +$1_generated_srcdir := $$(or $$($1_generated_srcdir),$1/generated) $1_generated_includedir := $$(or $$($1_generated_includedir),$1/generated) # Is this a multi-component project? -$1_multicomp := $(word 2,$($1_programs) $($1_libraries)) +$1_multicomp := $(word 2,$($1_programs) $($1_libraries)) -$1_extensions := $$($1_extensions) $(project_extensions) -$1_component_extensions := $$($1_component_extensions) $(component_extensions) -$1_component_with_config_extensions := $$($1_component_with_config_extensions) $(component_with_config_extensions) +$1_extensions := $$($1_extensions) $(project_extensions) +$1_component_extensions := $$($1_component_extensions) $(component_extensions) +$1_component_with_config_extensions := $$($1_component_with_config_extensions) $(component_with_config_extensions) # # Components add slice and object directories, slice files, generated @@ -694,10 +694,10 @@ $1_component_with_config_extensions := $$($1_component_with_config_extensions) $ # directories for which to generate Slice rules. The list of generated # header files is used to clean them. # -$1_slicedirs := -$1_slices := -$1_generated := -$1_objdirs := +$1_slicedirs := +$1_slices := +$1_generated := +$1_objdirs := ifneq ($$($1_extensions),) $$(foreach e,$$($1_extensions),$$(eval $$(call $$e,$1))) @@ -706,10 +706,10 @@ endif $$(foreach p,$$($1_programs),$$(if $$(filter $(SKIP),$$p),,$$(eval $$(call make-component,$1,$$p,program)))) $$(foreach l,$$($1_libraries),$$(if $$(filter $(SKIP),$$l),,$$(eval $$(call make-component,$1,$$l,library)))) -$1_slicedirs := $$(call unique,$$($1_slicedirs)) -$1_slices := $$(call unique,$$($1_slices)) -$1_generated := $$(call unique,$$($1_generated)) -$1_objdirs := $$(call unique,$$($1_objdirs)) +$1_slicedirs := $$(call unique,$$($1_slicedirs)) +$1_slices := $$(call unique,$$($1_slices)) +$1_generated := $$(call unique,$$($1_generated)) +$1_objdirs := $$(call unique,$$($1_objdirs)) # # Create object directories and generated directory if we're not cleaning. @@ -805,34 +805,34 @@ endef # Defines a project for the given translator # define create-translator-project -$1_programs := $(notdir $1) -$1_dependencies := Slice IceUtil -$1_cppflags := -I$1 -$1_targetdir := $(call bindir,$1) +$1_programs := $(notdir $1) +$1_dependencies := Slice IceUtil +$1_cppflags := -I$1 +$1_targetdir := $(call bindir,$1) # # Only build the translator with the static configuration # -$1_configs := static +$1_configs := static # Make sure the static/$(build-platform) are always enabled, the native translators # are required to build the sources for foreign architectures -$(notdir $1)_always_enable_configs := static -$(notdir $1)_always_enable_platforms := $(build-platform) +$(notdir $1)_always_enable_configs := static +$(notdir $1)_always_enable_platforms := $(build-platform) # However, don't always install the translator for the $(build-platforms) if it's # not explicitly listed in $(PLATFORMS) -$1_install_platforms := $(call component-platforms,$1,$(notdir $1)) +$1_install_platforms := $(call component-platforms,$1,$(notdir $1)) # # Defines the target extension and path of the slice translator # component. This is used by make-slices to create a dependency # on the translator for slice files. # -$(notdir $1)_targetext := $$(or $$($(notdir $1)_targetext),$(patsubst slice2%,%,$(or $2,$(notdir $1)))) -$(notdir $1)_path = $$($(notdir $1)[$(build-platform)-static]_targetdir)/$(notdir $1) +$(notdir $1)_targetext := $$(or $$($(notdir $1)_targetext),$(patsubst slice2%,%,$(or $2,$(notdir $1)))) +$(notdir $1)_path = $$($(notdir $1)[$(build-platform)-static]_targetdir)/$(notdir $1) -projects += $(project) +projects += $(project) endef # @@ -852,17 +852,17 @@ endef # Create the targets for the given projects and then make the project rules. # make-projects = $(foreach p,$1,$(eval $(call $(or $(if $($p_type),create-$($p_type)-project-targets),$3,create-project-targets),$p)))\ - $(foreach p,$1,$(eval $(call $(or $(if $($p_type),make-$($p_type)-project),$2,make-project),$p))) + $(foreach p,$1,$(eval $(call $(or $(if $($p_type),make-$($p_type)-project),$2,make-project),$p))) # # $(call depend_cppflags,$1=dependencyfile,$2=targetfile) # -depend-cppflags ?= -MT $2 -MMD -MP -MF $1 +depend-cppflags ?= -MT $2 -MMD -MP -MF $1 # # $(call rpath-ldflag,$1=rpath) # -rpath-ldflag ?= -Wl,-rpath,$1 +rpath-ldflag ?= -Wl,-rpath,$1 # # $(call mkxxx,$1=libname,$2=version,$3=soversion) @@ -875,19 +875,19 @@ mkshlibnametarget ?= $(if $3,$(mksoname),$(mkshlibfilename)) # # Helper functions # -dirname = $(patsubst %/,%,$(if $(findstring /,$1),$(dir $1))) -currentdir = $(call dirname,$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) -unique = $(strip $(if $1,$(firstword $1) $(call unique,$(filter-out $(firstword $1),$1)))) -files-to-dirs = $(call unique,$(call dirname,$(filter $(if $2,$(addprefix %.,$2),%),$1))) +dirname = $(patsubst %/,%,$(if $(findstring /,$1),$(dir $1))) +currentdir = $(call dirname,$(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) +unique = $(strip $(if $1,$(firstword $1) $(call unique,$(filter-out $(firstword $1),$1)))) +files-to-dirs = $(call unique,$(call dirname,$(filter $(if $2,$(addprefix %.,$2),%),$1))) -empty := -space := $(empty) $(empty) -comma := , +empty := +space := $(empty) $(empty) +comma := , -mappings = cpp objective-c python ruby php -mappingdir3 = $(if $(filter $(mappings),$(notdir $1)),$1,$(if $1,$(call mappingdir3,$(call dirname,$1)))) -mappingdir2 = $(if $(filter ../%,$1),$(call mappingdir2,$(patsubst ../%,%,$1)),$(call mappingdir3,$1)) -mappingdir = $(patsubst $(lang_srcdir)/%,%,$(if $(filter-out ../%,$1),$2,$(top_srcdir)/$(call mappingdir2,$1)/$2)) +mappings = cpp objective-c python ruby php +mappingdir3 = $(if $(filter $(mappings),$(notdir $1)),$1,$(if $1,$(call mappingdir3,$(call dirname,$1)))) +mappingdir2 = $(if $(filter ../%,$1),$(call mappingdir2,$(patsubst ../%,%,$1)),$(call mappingdir3,$1)) +mappingdir = $(patsubst $(lang_srcdir)/%,%,$(if $(filter-out ../%,$1),$2,$(top_srcdir)/$(call mappingdir2,$1)/$2)) # $(call subconfigs,$1=config) subconfigs = $(subst -,$(space),$1) @@ -915,20 +915,20 @@ var-value = $(call $(or $6,var-valu2),$1,$3,$4,$5,$3[$4-$5],$(call var-valu1,$(v # var-comp-names = $1 $(call var-names,$1,$2,$4,$5) $(call var-names,$1,$3,$4,$5) var-rcomp-names = $(call var-names,$1,$3,$4,$5) $(call var-names,$1,$2,$4,$5) $1 -var-compound = $(call $(or $6,var-valu2),$1,$3,$4,$5,$3[$4-$5],$(strip $(foreach v,$(var-comp-names),$($v)))) -var-rcompound = $(call $(or $6,var-valu2),$1,$3,$4,$5,$3[$4-$5],$(strip $(foreach v,$(var-rcomp-names),$($v)))) +var-compound = $(call $(or $6,var-valu2),$1,$3,$4,$5,$3[$4-$5],$(strip $(foreach v,$(var-comp-names),$($v)))) +var-rcompound = $(call $(or $6,var-valu2),$1,$3,$4,$5,$3[$4-$5],$(strip $(foreach v,$(var-rcomp-names),$($v)))) # # Return the given value after applying platform/configuration customization. # # $(call make-xxx,$1=varname,$2=component,$3=platform,$4=config,$5=$2[$3-$4],$6=value) # -make-dirwsuffix = $(patsubst %/,%,$6$(platform-var)/$(subst $(space),-,$(config-var))) +make-dirwsuffix = $(patsubst %/,%,$6$(platform-var)/$(subst $(space),-,$(config-var))) make-targetrule = $(patsubst -%,%,$(subst $(space),-,$(call platform-and-config-var,targetrule,$2,$3,$4,$5,$6))-$6) make-targetname = $6$(subst $(space),,$(platform-and-config-var)) -make-unique = $(call unique,$6) +make-unique = $(call unique,$6) make-flags = $6 $(platform-and-config-var) -make-deps = $(foreach d,$(call unique,$6),$d[$(subst $(space),-,$(call platform-and-config-var,dependency,$2,$3,$4,$5))]) +make-deps = $(foreach d,$(call unique,$6),$d[$(subst $(space),-,$(call platform-and-config-var,dependency,$2,$3,$4,$5))]) # # $(call var-with-default,varname,defaultvarname) @@ -951,26 +951,26 @@ ifeq ($(embedded_runpath),yes) ifeq ($(embedded_runpath_prefix),) # Add rpath relative to the path of the loader if linking with library from different directory. make-rpath-ldflag = $(if $(filter-out $1,$2),\ - $(if $(filter /%,$1),\ - $(call rpath-ldflag,$1),\ - $(call rpath-ldflag,$(loader_path)/$(call relpathfromdir,$(patsubst $(lang_srcdir)/%,%,$2))/$1)),\ - $(call rpath-ldflag,$(loader_path))) -make-shared-dep-ldflags = $(call make-rpath-ldflag,$($1_targetdir),$($2_targetdir)) -L$($1_targetdir) -l$($1_targetname) + $(if $(filter /%,$1),\ + $(call rpath-ldflag,$1),\ + $(call rpath-ldflag,$(loader_path)/$(call relpathfromdir,$(patsubst $(lang_srcdir)/%,%,$2))/$1)),\ + $(call rpath-ldflag,$(loader_path))) +make-shared-dep-ldflags = $(call make-rpath-ldflag,$($1_targetdir),$($2_targetdir)) -L$($1_targetdir) -l$($1_targetname) else # Add rpath with $(embedded_runpath_prefix) if linking with library installed in different directory. make-rpath-ldflag = $(if $(filter-out $1,$2),\ - $(call rpath-ldflag,$(patsubst $(prefix)/%,$(embedded_runpath_prefix)/%,$1))) -make-shared-dep-ldflags = $(call make-rpath-ldflag,$($1_installdir),$($2_installdir)) -L$($1_targetdir) -l$($1_targetname) + $(call rpath-ldflag,$(patsubst $(prefix)/%,$(embedded_runpath_prefix)/%,$1))) +make-shared-dep-ldflags = $(call make-rpath-ldflag,$($1_installdir),$($2_installdir)) -L$($1_targetdir) -l$($1_targetname) endif else -make-shared-dep-ldflags = -L$($1_targetdir) -l$($1_targetname) +make-shared-dep-ldflags = -L$($1_targetdir) -l$($1_targetname) endif -make-static-dep-ldflags = $($1_targetdir)/$(call mklibname,$($1_targetname)) +make-static-dep-ldflags = $($1_targetdir)/$(call mklibname,$($1_targetname)) make-system-lib-ldflags = $($1_system_libs) -make-lib-cppflags = $(foreach l,$($1_libs),$(if $($l_includedir),-I$(call $l_includedir,$l,$1)) $($l_cppflags)) -make-lib-ldflags = $(foreach l,$($1_libs),$(if $($l_libdir),-L$(call $l_libdir,$l,$1)) $($l_ldflags)) +make-lib-cppflags = $(foreach l,$($1_libs),$(if $($l_includedir),-I$(call $l_includedir,$l,$1)) $($l_cppflags)) +make-lib-ldflags = $(foreach l,$($1_libs),$(if $($l_libdir),-L$(call $l_libdir,$l,$1)) $($l_ldflags)) # # Helper to define third-party library flags @@ -980,11 +980,11 @@ make-lib-ldflags = $(foreach l,$($1_libs),$(if $($l_libdir),-L$(call $l_libdir, define make-lib ifneq ($($1_home),) # Check for 3rd party libraries either in home/lib<platform specific subdir> or home/lib -$1_installdir = $$($1_home)/lib$$(call platform-var,installdir,$1,$$($$2_platform),$$($$2_config),$$2,$$($1_home)/lib) -$1_libdir ?= $$(strip $$(if $$(wildcard $$($1_installdir)),$$($1_installdir),$$($1_home)/lib)) -$1_includedir ?= $$($1_home)/include +$1_installdir = $$($1_home)/lib$$(call platform-var,installdir,$1,$$($$2_platform),$$($$2_config),$$2,$$($1_home)/lib) +$1_libdir ?= $$(strip $$(if $$(wildcard $$($1_installdir)),$$($1_installdir),$$($1_home)/lib)) +$1_includedir ?= $$($1_home)/include endif -$1_ldflags ?= -l$1 +$1_ldflags ?= -l$1 endef # @@ -993,7 +993,7 @@ endef # Returns reversed relative path for directory (e.g.: test/Ice/operations # is transformed to ../../..). This is used for rpath computations. # -relpathfromdir = $(if $(findstring /,$1),$(call relpathfromdir,$(call dirname,$1))/..,..) +relpathfromdir = $(if $(findstring /,$1),$(call relpathfromdir,$(call dirname,$1))/..,..) # # $(call platform-and-config-var,$1=varname,$2=component,$3=platform,$4=config,$5=comp[platform-config],$6=value) @@ -1010,14 +1010,14 @@ relpathfromdir = $(if $(findstring /,$1),$(call relpathfromdir,$(call dirname,$ # This also supports default value for platform/configuration variables. So if # osx_objdir isn't defined, we'll use the default value platform_objdir. # -var-or-dflt = $(call $(if $(filter-out undefined,$(origin $1_$3[$4])),$1_$3[$4],\ - $(if $(filter-out undefined,$(origin $2_$3[$4])),$2_$3[$4],\ - $(if $(filter-out undefined,$(origin $1_$3[$($4_project)])),$1_$3[$($4_project)],\ - $(if $(filter-out undefined,$(origin $2_$3[$($4_project)])),$2_$3[$($4_project)],\ - $(if $(filter-out undefined,$(origin $1_$3)),$1_$3,\ - $2_$3))))),$4,$5,$6,$7,$8,$9) -platform-var = $(strip $(call var-or-dflt,$3,platform,$1,$2,$3,$4,$5,$6)) -config-var = $(strip $(foreach c,$(call subconfigs,$4),$(call var-or-dflt,$c,config,$1,$2,$3,$4,$5,$6,$c))) +var-or-dflt = $(call $(if $(filter-out undefined,$(origin $1_$3[$4])),$1_$3[$4],\ + $(if $(filter-out undefined,$(origin $2_$3[$4])),$2_$3[$4],\ + $(if $(filter-out undefined,$(origin $1_$3[$($4_project)])),$1_$3[$($4_project)],\ + $(if $(filter-out undefined,$(origin $2_$3[$($4_project)])),$2_$3[$($4_project)],\ + $(if $(filter-out undefined,$(origin $1_$3)),$1_$3,\ + $2_$3))))),$4,$5,$6,$7,$8,$9) +platform-var = $(strip $(call var-or-dflt,$3,platform,$1,$2,$3,$4,$5,$6)) +config-var = $(strip $(foreach c,$(call subconfigs,$4),$(call var-or-dflt,$c,config,$1,$2,$3,$4,$5,$6,$c))) platform-and-config-var = $(strip $(platform-var) $(config-var)) # @@ -1038,25 +1038,25 @@ source-to-dependency = $(patsubst %,%.d,$(notdir $1)) # # Defaults for configurations which don't override the specified variable -config_targetdir = $(if $(filter %/build,$5),$6) -config_objdir = $6 -config_dependency = $6 +config_targetdir = $(if $(filter %/build,$5),$6) +config_objdir = $6 +config_dependency = $6 # Static configuration for static builds -static_targetrule = $(if $(filter-out program,$($1_target)),static) -static_cppflags += $(strip $(call make-lib-cppflags,$4)) -DICE_STATIC_LIBS -static_ldflags += $$(call unique,$$(foreach d,$$(call get-all-deps,$4),$$(call make-static-dep-ldflags,$$d)))\ - $$(strip $$(foreach d,$$(call get-all-deps,$4) $4,$$(call make-lib-ldflags,$$d)))\ - $$(strip $$(foreach d,$$(call get-all-deps,$4) $4,$$(call make-system-lib-ldflags,$$d))) +static_targetrule = $(if $(filter-out program,$($1_target)),static) +static_cppflags += $(strip $(call make-lib-cppflags,$4)) -DICE_STATIC_LIBS +static_ldflags += $$(call unique,$$(foreach d,$$(call get-all-deps,$4),$$(call make-static-dep-ldflags,$$d)))\ + $$(strip $$(foreach d,$$(call get-all-deps,$4) $4,$$(call make-lib-ldflags,$$d)))\ + $$(strip $$(foreach d,$$(call get-all-deps,$4) $4,$$(call make-system-lib-ldflags,$$d))) # Shared configuration for shared builds -shared_projects = % -shared_objdir = $(if $(filter-out program,$($1_target)),shared/pic,shared/pie) -shared_targetrule = $(if $(filter-out program,$($1_target)),shared) -shared_cppflags += $(strip $(call make-lib-cppflags,$4)) -shared_ldflags += $$(call unique,$$(foreach d,$($4_dependencies),$$(call make-shared-dep-ldflags,$$d,$4)))\ - $$(strip $$(call make-lib-ldflags,$4))\ - $$(strip $$(call make-system-lib-ldflags,$4)) +shared_projects = % +shared_objdir = $(if $(filter-out program,$($1_target)),shared/pic,shared/pie) +shared_targetrule = $(if $(filter-out program,$($1_target)),shared) +shared_cppflags += $(strip $(call make-lib-cppflags,$4)) +shared_ldflags += $$(call unique,$$(foreach d,$($4_dependencies),$$(call make-shared-dep-ldflags,$$d,$4)))\ + $$(strip $$(call make-lib-ldflags,$4))\ + $$(strip $$(call make-system-lib-ldflags,$4)) # # Platform variables @@ -1065,14 +1065,14 @@ shared_ldflags += $$(call unique,$$(foreach d,$($4_dependencies),$$(call make-s # # Defaults for platforms which don't override the specified variable -platform_cc ?= $(CC) -platform_cxx ?= $(CXX) -platform_ld ?= $(CXX) -platform_ar ?= $(AR) -platform_objdir ?= /$2 -platform_targetdir ?= /$2 -platform_installdir ?= -platform_dependency ?= $2 +platform_cc ?= $(CC) +platform_cxx ?= $(CXX) +platform_ld ?= $(CXX) +platform_ar ?= $(AR) +platform_objdir ?= /$2 +platform_targetdir ?= /$2 +platform_installdir ?= +platform_dependency ?= $2 # # The projects variable is used to load projects in Makefile.mk fragments diff --git a/config/Make.rules b/config/Make.rules index 12072841260..5809d91aa01 100644 --- a/config/Make.rules +++ b/config/Make.rules @@ -11,7 +11,7 @@ # Select an installation base directory. The directory will be created # if it does not exist. # -prefix ?= /opt/Ice-$(version) +prefix ?= /opt/Ice-$(version) # # The "root directory" for runpath embedded in executables. Can be set @@ -26,7 +26,7 @@ prefix ?= /opt/Ice-$(version) # Define embedded_runpath as no if you don't want any runpath added to # the executables. If not set, defaults to to "yes" # -embedded_runpath ?= yes +embedded_runpath ?= yes # # Define new_dtags as yes if you want the linker to enable the new style @@ -40,7 +40,7 @@ new_dtags ?= no # without optimizations. Otherwise Ice is build with optimizations and # without debug information. # -OPTIMIZE ?= yes +OPTIMIZE ?= yes # # Default Mutex protocol: one of PrioNone or PrioInherit. @@ -54,7 +54,7 @@ OPTIMIZE ?= yes # Run `make print V=supported-platforms' to see the list of supported # platforms on this system. # -PLATFORMS ?= $(firstword $(supported-platforms)) +PLATFORMS ?= $(firstword $(supported-platforms)) # # Configurations to build. This defaults to the first supported @@ -63,7 +63,7 @@ PLATFORMS ?= $(firstword $(supported-platforms)) # Run `make print V=supported-configs` to see the list of supported # configurations. # -CONFIGS ?= $(firstword $(supported-configs)) +CONFIGS ?= $(firstword $(supported-configs)) # # List of binary distributions to build against. Defaults to undefined, @@ -79,49 +79,49 @@ CONFIGS ?= $(firstword $(supported-configs)) # where the compiler can find it, set the corresponding variable # below to the installation directory of the library. # -#MCPP_HOME ?= /opt/mcpp -#ICONV_HOME ?= /opt/iconv -#EXPAT_HOME ?= /opt/expat -#BZ2_HOME ?= /opt/bz2 -#LMDB_HOME ?= /opt/lmdb +#MCPP_HOME ?= /opt/mcpp +#ICONV_HOME ?= /opt/iconv +#EXPAT_HOME ?= /opt/expat +#BZ2_HOME ?= /opt/bz2 +#LMDB_HOME ?= /opt/lmdb # ---------------------------------------------------------------------- # Don't change anything below this line! # ---------------------------------------------------------------------- -os ?= $(shell uname) +os ?= $(shell uname) -include $(top_srcdir)/config/Make.rules.$(os) -include $(top_srcdir)/config/Make.project.rules -include $(top_srcdir)/config/Make.tests.rules +include $(top_srcdir)/config/Make.rules.$(os) +include $(top_srcdir)/config/Make.project.rules +include $(top_srcdir)/config/Make.tests.rules ifneq ($(ICE_BIN_DIST),) -prefix := $(or $(ICE_HOME),$(if $(filter Darwin,$(os)),/usr/local,/usr)) -bindir = $(install_bindir) -libdir = $(install_libdir) -slicedir = $(install_slicedir) -includedir = $(install_includedir) +prefix := $(or $(ICE_HOME),$(if $(filter Darwin,$(os)),/usr/local,/usr)) +bindir = $(install_bindir) +libdir = $(install_libdir) +slicedir = $(install_slicedir) +includedir = $(install_includedir) else -bindir = $(call mappingdir,$(or $1,$(currentdir)),bin) -libdir = $(call mappingdir,$(or $1,$(currentdir)),lib) -slicedir = $(top_srcdir)/slice -includedir = $(call mappingdir,$(or $1,$(currentdir)),include) +bindir = $(call mappingdir,$(or $1,$(currentdir)),bin) +libdir = $(call mappingdir,$(or $1,$(currentdir)),lib) +slicedir = $(top_srcdir)/slice +includedir = $(call mappingdir,$(or $1,$(currentdir)),include) endif -srcdir = $(call mappingdir,$(or $1,$(currentdir)),src) +srcdir = $(call mappingdir,$(or $1,$(currentdir)),src) -usr_dir_install := $(or $(filter yes,$(USR_DIR_INSTALL)),$(filter /usr%,$(prefix))) -install_bindir ?= $(prefix)/bin -install_libdir ?= $(prefix)/lib -install_slicedir ?= $(prefix)$(if $(usr_dir_install),/share/ice)/slice -install_includedir ?= $(prefix)/include -install_docdir ?= $(prefix)$(if $(usr_dir_install),/share/ice) -install_mandir ?= $(prefix)$(if $(usr_dir_install),/share)/man -install_configdir ?= $(prefix)$(if $(usr_dir_install),/share/ice,/config) +usr_dir_install := $(or $(filter yes,$(USR_DIR_INSTALL)),$(filter /usr%,$(prefix))) +install_bindir ?= $(prefix)/bin +install_libdir ?= $(prefix)/lib +install_slicedir ?= $(prefix)$(if $(usr_dir_install),/share/ice)/slice +install_includedir ?= $(prefix)/include +install_docdir ?= $(prefix)$(if $(usr_dir_install),/share/ice) +install_mandir ?= $(prefix)$(if $(usr_dir_install),/share)/man +install_configdir ?= $(prefix)$(if $(usr_dir_install),/share/ice,/config) -version = 3.7.0 -mmversion = 3.7 -soversion = 37 +version = 3.7.0 +mmversion = 3.7 +soversion = 37 # # The compatversion is the lowest patch release with the same API. @@ -134,18 +134,18 @@ compatversion = $(version) # # Support for 3rd party libraries # -thirdparties := mcpp iconv expat bz2 lmdb -mcpp_home := $(MCPP_HOME) -iconv_home := $(ICONV_HOME) -expat_home := $(EXPAT_HOME) -bz2_home := $(BZ2_HOME) -lmdb_home := $(LMDB_HOME) +thirdparties := mcpp iconv expat bz2 lmdb +mcpp_home := $(MCPP_HOME) +iconv_home := $(ICONV_HOME) +expat_home := $(EXPAT_HOME) +bz2_home := $(BZ2_HOME) +lmdb_home := $(LMDB_HOME) $(foreach l,$(thirdparties),$(eval $(call make-lib,$l))) # # Languages, platforms and configurations to build # -supported-languages ?= cpp java java-compat python js ruby php -supported-configs ?= shared +supported-languages ?= cpp java java-compat python js ruby php +supported-configs ?= shared diff --git a/config/Make.rules.AIX b/config/Make.rules.AIX index 29624c9d033..d6da61fbb4f 100644 --- a/config/Make.rules.AIX +++ b/config/Make.rules.AIX @@ -19,7 +19,7 @@ ppc64_targetdir = $(if $(filter %/build,$5),/ppc64,$(if $(filter-out $($1_ta ppc64_targetname = $(if $(and $(filter $(bindir)%,$($4_targetdir)),$(filter $($1_target),program)),_64) shared_cppflags = -brtl -static_targetdir = $(if $(and $(filter-out %/build,$5),$(filter $($1_target),program)),,static) +static_targetdir = $(if $(and $(filter-out %/build,$5),$(filter $($1_target),program)),,static) platform_cxx = xlC_r platform_ld = xlC_r @@ -42,7 +42,7 @@ ifeq ($(embedded_runpath),yes) endif endif -depend-cppflags = -qmakedep=gcc -MF $1 +depend-cppflags = -qmakedep=gcc -MF $1 rpath-ldflag = -Wl,-blibpath:$1:/usr/lib # $(call mklib,$1=target,$2=objects,$3=libname,$4=version,$5=soversion,$6=ldflags,$7=platform) @@ -52,7 +52,7 @@ mklib = $(or $($7_ar),$(AR)) -X32_64 cr $1 $2 tmpsofile = $(dir $1)lib$2.so$(if $3,.$3) mkshlib ?= $(or $($7_cxx),$(CXX)) -qmkshrobj -o $(call tmpsofile,$1,$3,$5) $2 $6 && \ $(or $($7_ar),$(AR)) -X32_64 cr $1 $(call tmpsofile,$1,$3,$5) && \ - rm $(call tmpsofile,$1,$3,$5) + rm $(call tmpsofile,$1,$3,$5) # # $(call mkxxx,$1=libname,$2=version,$3=soversion) diff --git a/config/Make.rules.Darwin b/config/Make.rules.Darwin index 6421628fc05..16b2aad47c7 100644 --- a/config/Make.rules.Darwin +++ b/config/Make.rules.Darwin @@ -7,34 +7,34 @@ # # ********************************************************************** -supported-platforms = macosx iphoneos iphonesimulator -supported-languages = cpp java java-compat python js ruby php objective-c +supported-platforms = macosx iphoneos iphonesimulator +supported-languages = cpp java java-compat python js ruby php objective-c macosx_ar = libtool -macosx_cppflags = -mmacosx-version-min=10.9 -arch x86_64 -macosx_ldflags = $(macosx_cppflags) -macosx_targetdir = $(if $(filter %/build,$5),/macosx) - -iphoneos_ar = libtool -iphoneos_cc = xcrun -sdk iphoneos clang -iphoneos_cxx = xcrun -sdk iphoneos clang++ -iphoneos_cppflags = -miphoneos-version-min=7.1 -arch armv7s -arch arm64 -fembed-bitcode -iphoneos_ldflags = -miphoneos-version-min=7.1 -arch armv7s -arch arm64 -iphoneos_configs = %xcodesdk -iphoneos_targetdir = $(if $(filter %/build,$5),/iphoneos) - -iphonesimulator_ar = libtool -iphonesimulator_cc = xcrun -sdk iphonesimulator clang -iphonesimulator_cxx = xcrun -sdk iphonesimulator clang++ -iphonesimulator_cppflags = -mios-simulator-version-min=7.1 -arch i386 -arch x86_64 -iphonesimulator_ldflags = $(iphonesimulator_cppflags) -iphonesimulator_configs = %xcodesdk -iphonesimulator_targetdir = $(if $(filter %/build,$5),/iphonesimulator) +macosx_cppflags = -mmacosx-version-min=10.9 -arch x86_64 +macosx_ldflags = $(macosx_cppflags) +macosx_targetdir = $(if $(filter %/build,$5),/macosx) + +iphoneos_ar = libtool +iphoneos_cc = xcrun -sdk iphoneos clang +iphoneos_cxx = xcrun -sdk iphoneos clang++ +iphoneos_cppflags = -miphoneos-version-min=7.1 -arch armv7s -arch arm64 -fembed-bitcode +iphoneos_ldflags = -miphoneos-version-min=7.1 -arch armv7s -arch arm64 +iphoneos_configs = %xcodesdk +iphoneos_targetdir = $(if $(filter %/build,$5),/iphoneos) + +iphonesimulator_ar = libtool +iphonesimulator_cc = xcrun -sdk iphonesimulator clang +iphonesimulator_cxx = xcrun -sdk iphonesimulator clang++ +iphonesimulator_cppflags = -mios-simulator-version-min=7.1 -arch i386 -arch x86_64 +iphonesimulator_ldflags = $(iphonesimulator_cppflags) +iphonesimulator_configs = %xcodesdk +iphonesimulator_targetdir = $(if $(filter %/build,$5),/iphonesimulator) # If building objects for a shared library, enable fPIC -shared_cppflags = $(if $(filter-out program,$($1_target)),-fPIC) -fvisibility=hidden +shared_cppflags = $(if $(filter-out program,$($1_target)),-fPIC) -fvisibility=hidden -cppflags = -Wall -Wdeprecated -Werror -pthread $(if $(filter yes,$(OPTIMIZE)),-O2 -DNDEBUG,-g) +cppflags = -Wall -Wdeprecated -Werror -pthread $(if $(filter yes,$(OPTIMIZE)),-O2 -DNDEBUG,-g) ifeq ($(MAXWARN),yes) cppflags += -Wextra -Wshadow -Wredundant-decls -Wweak-vtables endif @@ -63,14 +63,14 @@ mkshlibfilename = lib$1$(if $2,.$2).dylib mkshlibname = lib$1.dylib mkshlibnametarget = $(mkshlibfilename) -mkpymodulename = $1.so -mkrbmodulename = $1.bundle +mkpymodulename = $1.so +mkrbmodulename = $1.bundle mkphpmodulename = $1.so # # System libraries # -Ice_system_libs := -ldl +Ice_system_libs := -ldl # Frameworks for macos IceSSL[macosx]_system_libs := -framework Security -framework CoreFoundation diff --git a/config/Make.rules.Linux b/config/Make.rules.Linux index 55e1962d833..475ac7f133b 100644 --- a/config/Make.rules.Linux +++ b/config/Make.rules.Linux @@ -7,9 +7,9 @@ # # ********************************************************************** -linux_id = $(shell . /etc/os-release && echo $${ID}) +linux_id = $(shell . /etc/os-release && echo $${ID}) -is-bin-program = $(and $(filter $(bindir)%,$($4_targetdir)),$(filter $($1_target),program)) +is-bin-program = $(and $(filter $(bindir)%,$($4_targetdir)),$(filter $($1_target),program)) ifneq ($(OECORE_SDK_VERSION),) @@ -41,7 +41,7 @@ else ifneq ($(filter centos rhel fedora,$(linux_id)),) # MultiLib Linux (x64 libraries go in the lib64 directory, x86 executable names are suffixed with 32) # supported-platforms = x64 x86 -multilib-platform = yes +multilib-platform = yes ifeq ($(OPTIMIZE),yes) # Use default system packaging flags if building with OPTIMIZE and CXXFLAGS/LDFLAGS aren't defined. @@ -52,16 +52,16 @@ endif x64_cppflags := $(call opt-cppflags,x86_64) -m64 x64_ldflags := $(call opt-ldflags,x86_64) -m64 -x64_targetdir = $(if $(filter %/build,$5),/x64,$(if $(filter-out $($1_target),program),64)) -x64_installdir = $(if $(and $(filter-out $($1_target),program),$(filter-out %64,$5)),64) +x64_targetdir = $(if $(filter %/build,$5),/x64,$(if $(filter-out $($1_target),program),64)) +x64_installdir = $(if $(and $(filter-out $($1_target),program),$(filter-out %64,$5)),64) x86_cppflags := $(call opt-cppflags,i386) -m32 x86_ldflags := $(call opt-ldflags,i386) -m32 -x86_targetdir = $(if $(filter %/build,$5),/x86) -x86_targetname = $(if $(is-bin-program),32) +x86_targetdir = $(if $(filter %/build,$5),/x86) +x86_targetname = $(if $(is-bin-program),32) # No Slice translators for x86 -x86_excludes = slice2% +x86_excludes = slice2% else ifneq ($(filter debian ubuntu,$(linux_id)),) @@ -69,40 +69,40 @@ else ifneq ($(filter debian ubuntu,$(linux_id)),) # MultiArch Linux (libraries are installed in lib/<arch>, executables are installed in bin/<arch> # except for the build architecture where executables are installed in bin/). # -build-platform ?= $(shell dpkg --print-architecture) -foreign-platforms ?= $(shell dpkg --print-foreign-architectures) +build-platform ?= $(shell dpkg --print-architecture) +foreign-platforms ?= $(shell dpkg --print-foreign-architectures) supported-platforms = $(build-platform) $(foreign-platforms) -dpkg-arch = $(shell dpkg-architecture -f -a$1 -q$2 2> /dev/null) +dpkg-arch = $(shell dpkg-architecture -f -a$1 -q$2 2> /dev/null) ifeq ($(OPTIMIZE),yes) # Use default system packaging flags if building with OPTIMIZE and CXXFLAGS/LDFLAGS aren't defined. -opt-cppflags = $(if $(CXXFLAGS),,$(shell dpkg-buildflags --get CXXFLAGS)) -opt-ldflags = $(if $(LDFLAGS),,$(shell DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow dpkg-buildflags --get LDFLAGS)) +opt-cppflags = $(if $(CXXFLAGS),,$(shell dpkg-buildflags --get CXXFLAGS)) +opt-ldflags = $(if $(LDFLAGS),,$(shell DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow dpkg-buildflags --get LDFLAGS)) endif # $(call make-platform-config,$1=platform) define make-platform-config -$1_gnu_type = $(call dpkg-arch,$1,DEB_HOST_GNU_TYPE) -$1_multiarch = $(call dpkg-arch,$1,DEB_HOST_MULTIARCH) - -$1_cc = $$($1_gnu_type)-$(CC) -$1_cxx = $$($1_gnu_type)-$(CXX) -$1_libtool = $$($1_gnu_type)-$(AR) -$1_targetdir = /$$($1_multiarch) -$1_objdir = /$$($1_multiarch) -$1_installdir = $$(if $$(and $(is-bin-program),$(usr_dir_install)),,/$$($1_multiarch)) - -$1_cppflags = $(opt-cppflags) -$1_ldflags = $(opt-ldflags) +$1_gnu_type = $(call dpkg-arch,$1,DEB_HOST_GNU_TYPE) +$1_multiarch = $(call dpkg-arch,$1,DEB_HOST_MULTIARCH) + +$1_cc = $$($1_gnu_type)-$(CC) +$1_cxx = $$($1_gnu_type)-$(CXX) +$1_libtool = $$($1_gnu_type)-$(AR) +$1_targetdir = /$$($1_multiarch) +$1_objdir = /$$($1_multiarch) +$1_installdir = $$(if $$(and $(is-bin-program),$(usr_dir_install)),,/$$($1_multiarch)) + +$1_cppflags = $(opt-cppflags) +$1_ldflags = $(opt-ldflags) endef $(foreach p,$(supported-platforms),$(eval $(call make-platform-config,$p))) # For the build platform architecture, build and install executables in bin, libraries in lib/<arch> -$(build-platform)_targetdir = $(if $(or $(filter %/build,$5),$(filter-out $($1_target),program)),/$($2_multiarch)) -$(build-platform)_installdir = $(if $(is-bin-program),,/$($2_multiarch)) +$(build-platform)_targetdir = $(if $(or $(filter %/build,$5),$(filter-out $($1_target),program)),/$($2_multiarch)) +$(build-platform)_installdir = $(if $(is-bin-program),,/$($2_multiarch)) else @@ -123,26 +123,26 @@ endif x64_cppflags := $(call opt-cppflags,x86_64) x64_ldflags := $(call opt-ldflags,x86_64) -x64_targetdir = $(if $(filter %/build,$5),/x64,$(if $(filter-out $($1_target),program),64)) -x64_installdir = $(if $(and $(filter-out $($1_target),program),$(filter-out %64,$($1_installdir))),64) +x64_targetdir = $(if $(filter %/build,$5),/x64,$(if $(filter-out $($1_target),program),64)) +x64_installdir = $(if $(and $(filter-out $($1_target),program),$(filter-out %64,$($1_installdir))),64) x86_cppflags := $(call opt-cppflags,i386) x86_ldflags := $(call opt-ldflags,i386) -x86_targetdir = $(if $(filter %/build,$5),/x86) +x86_targetdir = $(if $(filter %/build,$5),/x86) endif -rpath-link-ldflag = -Wl,-rpath-link,$1 +rpath-link-ldflag = -Wl,-rpath-link,$1 make-rpath-link-ldflags = $(foreach d,$(filter-out $2,$(call get-all-deps,$1)),$(call rpath-link-ldflag,$($d_targetdir))) # If building objects for a shared library build, enable PIC or PIE: -shared_cppflags = $(if $(filter-out program,$($1_target)),-fPIC,-fPIE) -fvisibility=hidden +shared_cppflags = $(if $(filter-out program,$($1_target)),-fPIC,-fPIE) -fvisibility=hidden # If we are linking a program, add -rpath-link to locate secondary libraries that aren't linked with the executable. -shared_ldflags = $(if $(filter-out program,$($1_target)),\ +shared_ldflags = $(if $(filter-out program,$($1_target)),\ $(if $(filter yes,$(allow-undefined-symbols)),,-Wl$(comma)--no-undefined),\ -pie $(if $(filter yes,$(new_dtags)),-Wl$(comma)--enable-new-dtags,-Wl$(comma)--disable-new-dtags) \ - $$(call unique,$$(foreach d,$($4_dependencies),$$(call make-rpath-link-ldflags,$$d,$($4_dependencies))))) + $$(call unique,$$(foreach d,$($4_dependencies),$$(call make-rpath-link-ldflags,$$d,$($4_dependencies))))) cppflags = -Wall -Wdeprecated -Werror -pthread $(if $(filter yes,$(OPTIMIZE)),-DNDEBUG,-g) ldflags = -pthread @@ -183,7 +183,7 @@ ifneq ($(libbacktrace_fullpath),libbacktrace.a) endif endif -IceUtil_system_libs = -lrt $(if $(filter yes,$(libbacktrace)),-lbacktrace) -Ice_system_libs = -ldl -lcrypto $(IceUtil_system_libs) -IceSSL_system_libs = -lssl -lcrypto -Glacier2CryptPermissionsVerifier_system_libs = -lcrypt +IceUtil_system_libs = -lrt $(if $(filter yes,$(libbacktrace)),-lbacktrace) +Ice_system_libs = -ldl -lcrypto $(IceUtil_system_libs) +IceSSL_system_libs = -lssl -lcrypto +Glacier2CryptPermissionsVerifier_system_libs = -lcrypt diff --git a/config/Make.tests.rules b/config/Make.tests.rules index acc8ced7c44..88d16b28442 100644 --- a/config/Make.tests.rules +++ b/config/Make.tests.rules @@ -21,19 +21,19 @@ test = $(patsubst $(lang_srcdir)/%,%,$(if $1,$1,$(currentdir))) # doesn't exist, returns an empty value. # test-sources = $(call unique,$(if $1,$(foreach f,$1,$(notdir $(wildcard $2/$f))),\ - $(if $(wildcard $2/$(firstword $3)),$(foreach f,$3,$(notdir $(wildcard $2/$f)))))) + $(if $(wildcard $2/$(firstword $3)),$(foreach f,$3,$(notdir $(wildcard $2/$f)))))) # # The test executables to try to build in each test directory # -test-programs = client server serveramd collocated +test-programs = client server serveramd collocated # # The default test sources for each test executable. # -test-client-sources = Client.$1 *Test.ice AllTests.$1 -test-server-sources = Server.$1 *Test.ice TestI.$1 -test-serveramd-sources = ServerAMD.$1 *TestAMD.ice TestAMDI.$1 +test-client-sources = Client.$1 *Test.ice AllTests.$1 +test-server-sources = Server.$1 *Test.ice TestI.$1 +test-serveramd-sources = ServerAMD.$1 *TestAMD.ice TestAMDI.$1 test-collocated-sources = Collocated.$1 # @@ -60,25 +60,25 @@ test-collocated-sources = Collocated.$1 # define create-test-project -$1_srcdir := $1 -$1_programs := $$(or $$($1_programs),$(test-programs)) -$1_noinstall := 1 +$1_srcdir := $1 +$1_programs := $$(or $$($1_programs),$(test-programs)) +$1_noinstall := 1 -$1_client_sources := $$(call test-sources,$$(call $1_client_sources,$$($1_srcext)),$$($1_srcdir),\ - $$(call test-client-sources,$$($1_srcext))) +$1_client_sources := $$(call test-sources,$$(call $1_client_sources,$$($1_srcext)),$$($1_srcdir),\ + $$(call test-client-sources,$$($1_srcext))) -$1_server_sources := $$(call test-sources,$$(call $1_server_sources,$$($1_srcext)),$$($1_srcdir),\ - $$(call test-server-sources,$$($1_srcext))) +$1_server_sources := $$(call test-sources,$$(call $1_server_sources,$$($1_srcext)),$$($1_srcdir),\ + $$(call test-server-sources,$$($1_srcext))) -$1_serveramd_sources := $$(call test-sources,$$(call $1_serveramd_sources,$$($1_srcext)),$$($1_srcdir),\ - $$(call test-serveramd-sources,$$($1_srcext))) +$1_serveramd_sources := $$(call test-sources,$$(call $1_serveramd_sources,$$($1_srcext)),$$($1_srcdir),\ + $$(call test-serveramd-sources,$$($1_srcext))) -$1_collocated_sources := $$(call test-sources,$$(call $1_collocated_sources,$$($1_srcext)),$$($1_srcdir),\ - $$(call test-collocated-sources,$$($1_srcext)) \ - $$(filter-out Server.$$($1_srcext) Client.$$($1_srcext),\ - $$(notdir $$($1_client_sources) $$($1_server_sources)))) +$1_collocated_sources := $$(call test-sources,$$(call $1_collocated_sources,$$($1_srcext)),$$($1_srcdir),\ + $$(call test-collocated-sources,$$($1_srcext)) \ + $$(filter-out Server.$$($1_srcext) Client.$$($1_srcext),\ + $$(notdir $$($1_client_sources) $$($1_server_sources)))) -$1_programs := $$(foreach p,$$($1_programs),$$(if $$($1_$$(p)_sources),$1_$$(p))) +$1_programs := $$(foreach p,$$($1_programs),$$(if $$($1_$$(p)_sources),$1_$$(p))) $$(foreach m,$$($1_programs) $$($1_libraries),$$(eval $$m_sources := $$(addprefix $$($1_srcdir)/,$$($$m_sources)))) @@ -90,7 +90,7 @@ endef # Returns the tests which don't have a Makefile.mk fragment specified # tests-without-project-makefile = $(foreach d,$(patsubst %/Client.$1,%,$(shell find $(lang_srcdir)/test -name Client.$1)),\ - $(if $(wildcard $d/Makefile.mk),,$(call test,$d))) + $(if $(wildcard $d/Makefile.mk),,$(call test,$d))) # # The tests variable is used to load tests in Makefile.mk fragments diff --git a/config/Make.xcodesdk.rules b/config/Make.xcodesdk.rules index d6cc513c9e8..1ef7e6777f9 100644 --- a/config/Make.xcodesdk.rules +++ b/config/Make.xcodesdk.rules @@ -10,13 +10,13 @@ # # Xcode configuration to build Xcode IceSDK. # -xcodesdk_objdir = static -xcodesdk_cppflags = $(static_cppflags) -xcodesdk_ldflags = $(static_ldflags) +xcodesdk_objdir = static +xcodesdk_cppflags = $(static_cppflags) +xcodesdk_ldflags = $(static_ldflags) ifeq ($(filter all cpp obj%c,$(ICE_BIN_DIST)),) $(foreach d,Ice IceSSL Glacier2 IceStorm IceGrid IceDiscovery IceLocatorDiscovery IceIAP \ - IceObjC IceSSLObjC Glacier2ObjC IceStormObjC IceGridObjC,$(eval $d[xcodesdk]_targetdir := $(top_srcdir))) + IceObjC IceSSLObjC Glacier2ObjC IceStormObjC IceGridObjC,$(eval $d[xcodesdk]_targetdir := $(top_srcdir))) endif # @@ -34,10 +34,10 @@ $(install_libdir)/IceSDK/bin/$(notdir $1) $(top_srcdir)/IceSDK/bin/$(notdir $1): $(Q)$(INSTALL) $1 $$@ $$(eval $$(call install-data-files,\ - $$(wildcard $(top_srcdir)/slice/*/*.ice),$(top_srcdir)/slice,$(top_srcdir)/IceSDK/slice,all)) + $$(wildcard $(top_srcdir)/slice/*/*.ice),$(top_srcdir)/slice,$(top_srcdir)/IceSDK/slice,all)) $$(eval $$(call install-data-files,\ - $$(wildcard $(top_srcdir)/slice/*/*.ice),$(top_srcdir)/slice,$(install_libdir)/IceSDK/slice,install)) + $$(wildcard $(top_srcdir)/slice/*/*.ice),$(top_srcdir)/slice,$(install_libdir)/IceSDK/slice,install)) srcs all:: $$(foreach p,$$(platforms),$(top_srcdir)/IceSDK/$$p.sdk/SDKSettings.plist) \ $(top_srcdir)/IceSDK/bin/$(notdir $1) @@ -59,14 +59,14 @@ ifneq ($$(filter-out $$($2_sdk_includedirs),$3-$2),) $2_sdk_includedirs += $3-$2 $$(eval $$(call install-data-files,$$(wildcard $$($2_includedir)/*.h),include,\ - $(top_srcdir)/IceSDK/$3.sdk/usr/include,$5)) + $(top_srcdir)/IceSDK/$3.sdk/usr/include,$5)) $$(eval $$(call install-data-files,$$(filter include/generated/%,$$($2_generated_headers)),include/generated,\ - $(top_srcdir)/IceSDK/$3.sdk/usr/include,$5)) + $(top_srcdir)/IceSDK/$3.sdk/usr/include,$5)) $$(eval $$(call install-data-files,$$(wildcard $$($2_includedir)/*.h),include,\ - $(install_libdir)/IceSDK/$3.sdk/usr/include,$5_install)) + $(install_libdir)/IceSDK/$3.sdk/usr/include,$5_install)) $$(eval $$(call install-data-files,$$(filter include/generated/%,$$($2_generated_headers)),include/generated,\ - $(install_libdir)/IceSDK/$3.sdk/usr/include,$5_install)) + $(install_libdir)/IceSDK/$3.sdk/usr/include,$5_install)) endif endef @@ -116,7 +116,7 @@ define make-xcode-project $$(foreach p,$$(filter $(platforms),$$($1_platforms)),\ $$(foreach c,$$(filter $$(or $$($$p_configs),%),$$(filter $(configs),$$($1_configs))),\ $$(if $$(filter $(SKIP),$1[$$p-$$c]),,\ - $$(eval $$(call make-xcode-project-with-config,$1,$$p,$$c,$1[$$p-$$c]))))) + $$(eval $$(call make-xcode-project-with-config,$1,$$p,$$c,$1[$$p-$$c]))))) $1:: $1_clean:: diff --git a/cpp/Makefile b/cpp/Makefile index 76e78976467..4dc4a22610f 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -7,8 +7,8 @@ # # ********************************************************************** -top_srcdir := .. -lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))) +top_srcdir := .. +lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))) include $(top_srcdir)/config/Make.rules include $(lang_srcdir)/config/Make.rules diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index ae89a9a6622..6e9a1ce9b20 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -16,35 +16,35 @@ # supported-configs = shared static cpp11-shared cpp11-static --include $(lang_srcdir)/config/Make.rules.$(os) +-include $(lang_srcdir)/config/Make.rules.$(os) ifeq ($(os),Darwin) -include $(lang_srcdir)/config/Make.xcodesdk.rules +include $(lang_srcdir)/config/Make.xcodesdk.rules endif # # Define which projects to build for the different configurations. # -coreandstub_components = IceUtil \ - Ice \ - IceSSL \ - IceDiscovery \ - IceLocatorDiscovery \ - Glacier2 \ - IceStorm \ - IceGrid \ - IceBox \ - IcePatch2 +coreandstub_components = IceUtil \ + Ice \ + IceSSL \ + IceDiscovery \ + IceLocatorDiscovery \ + Glacier2 \ + IceStorm \ + IceGrid \ + IceBox \ + IcePatch2 # Add the Bluetooth transport for Debian/Ubuntu/Yocto ifneq ($(filter debian ubuntu yocto,$(linux_id)),) -coreandstub_components += IceXML IceBT +coreandstub_components += IceXML IceBT endif # # Build all the projects with the shared configuration, except IceUtil and Slice # that are static-only # -shared_projects = % +shared_projects = % shared_excludes = IceUtil Slice # @@ -57,18 +57,18 @@ static_excludes = test/Ice/library test/Ice/plugin # # Components and projects which are built with C++11 # -cpp11_components = $(coreandstub_components) icebox +cpp11_components = $(coreandstub_components) icebox -cpp11_projects = test/Common \ - test/IceUtil/% \ - test/Slice/% \ - test/Ice/% \ - test/IceSSL/% \ - test/IceDiscovery/% \ - test/IceBox/% +cpp11_projects = test/Common \ + test/IceUtil/% \ + test/Slice/% \ + test/Ice/% \ + test/IceSSL/% \ + test/IceDiscovery/% \ + test/IceBox/% -cpp11_excludes = IcePatch2 \ - test/Ice/gc +cpp11_excludes = IcePatch2 \ + test/Ice/gc # # If building on a Linux multilib platform, we restrict what we build for @@ -76,8 +76,8 @@ cpp11_excludes = IcePatch2 \ # as C++11 (libraries and icebox executable). # ifeq ($(multilib-platform),yes) -x86_components = $(coreandstub_components) IceDB IceStormService icebox -x86_projects = test/% +x86_components = $(coreandstub_components) IceDB IceStormService icebox +x86_projects = test/% endif # @@ -90,18 +90,18 @@ endif # the cpp11 name to the target directory if building outside the build # directory. # -cpp11_cppflags = -DICE_CPP11_MAPPING -std=c++11 -cpp11_targetname = $(if $(or $(filter-out $($1_target),program),$(filter $(bindir)%,$($4_targetdir))),++11) -cpp11_targetdir = $(if $(filter %/build,$5),cpp11) +cpp11_cppflags = -DICE_CPP11_MAPPING -std=c++11 +cpp11_targetname = $(if $(or $(filter-out $($1_target),program),$(filter $(bindir)%,$($4_targetdir))),++11) +cpp11_targetdir = $(if $(filter %/build,$5),cpp11) # # $(call make-cpp-src-project,$1=project) # define make-cpp-src-project ifeq ($(filter all cpp,$(ICE_BIN_DIST)),) -$1_slicecompiler := slice2cpp -$1_sliceflags += -I$(slicedir) -$1_cppflags += -Isrc -I$1/generated -I$(includedir) -I$(includedir)/generated -DICE_BUILDING_SRC +$1_slicecompiler := slice2cpp +$1_sliceflags += -I$(slicedir) +$1_cppflags += -Isrc -I$1/generated -I$(includedir) -I$(includedir)/generated -DICE_BUILDING_SRC $(make-project) srcs:: $1 endif @@ -111,11 +111,11 @@ endef # $(call make-cpp-test-project,$1=project) # define make-cpp-test-project -$1_slicecompiler := slice2cpp -$1_sliceflags += -I$(slicedir) -$1_cppflags += -I$1/generated -I$1 -Itest/include -I$(includedir) +$1_slicecompiler := slice2cpp +$1_sliceflags += -I$(slicedir) +$1_cppflags += -I$1/generated -I$1 -Itest/include -I$(includedir) ifeq ($(filter all cpp,$(ICE_BIN_DIST)),) -$1_cppflags += -I$(includedir)/generated +$1_cppflags += -I$(includedir)/generated endif $(make-project) tests:: $1 @@ -125,18 +125,18 @@ endef # $(create-cpp-test-project $1=test) # define create-cpp-test-project -$1_srcext := cpp -$1_dependencies := $$(or $$($1_dependencies),TestCommon Ice) +$1_srcext := cpp +$1_dependencies := $$(or $$($1_dependencies),TestCommon Ice) # Also link with IceSSL and IceBT (Debian/Ubuntu/Yocto) when compiling the project with the static configuration -$1[static]_dependencies := IceSSL $(if $(filter debian ubuntu yocto,$(linux_id)),IceBT) +$1[static]_dependencies := IceSSL $(if $(filter debian ubuntu yocto,$(linux_id)),IceBT) # Dependencies and target dirs for Xcode SDK test projects -$1[xcodesdk]_dependencies := IceSSL -$1[iphoneos-xcodesdk]_targetdir := test/ios/bundles/Bundles-iphoneos/$(subst /,_,$1) -$1[iphonesimulator-xcodesdk]_targetdir := test/ios/bundles/Bundles-iphonesimulator/$(subst /,_,$1) -$1[iphoneos-cpp11-xcodesdk]_targetdir := test/ios/bundles/Bundles++11-iphoneos/$(subst /,_,$1) -$1[iphonesimulator-cpp11-xcodesdk]_targetdir := test/ios/bundles/Bundles++11-iphonesimulator/$(subst /,_,$1) +$1[xcodesdk]_dependencies := IceSSL +$1[iphoneos-xcodesdk]_targetdir := test/ios/bundles/Bundles-iphoneos/$(subst /,_,$1) +$1[iphonesimulator-xcodesdk]_targetdir := test/ios/bundles/Bundles-iphonesimulator/$(subst /,_,$1) +$1[iphoneos-cpp11-xcodesdk]_targetdir := test/ios/bundles/Bundles++11-iphoneos/$(subst /,_,$1) +$1[iphonesimulator-cpp11-xcodesdk]_targetdir := test/ios/bundles/Bundles++11-iphonesimulator/$(subst /,_,$1) $(create-test-project) endef diff --git a/cpp/config/Make.rules.MINGW b/cpp/config/Make.rules.MINGW index b0a0997d823..cf3e3d901ce 100644 --- a/cpp/config/Make.rules.MINGW +++ b/cpp/config/Make.rules.MINGW @@ -22,8 +22,8 @@ CXX = c++ # 0x602 = Windows 8 / Windows Server 2012 ICE_WIN32_WINNT := 0x601 -CXXFLAGS = $(CXXARCHFLAGS) -mthreads -Wall -Werror -D_WIN32_WINNT=$(ICE_WIN32_WINNT) -DWIN32_LEAN_AND_MEAN -LDFLAGS = -Wl,-no-undefined +CXXFLAGS = $(CXXARCHFLAGS) -mthreads -Wall -Werror -D_WIN32_WINNT=$(ICE_WIN32_WINNT) -DWIN32_LEAN_AND_MEAN +LDFLAGS = -Wl,-no-undefined ifeq ($(STATICLIBS),yes) CXXFLAGS += -DICE_STATIC_LIBS @@ -36,9 +36,9 @@ else CXXFLAGS += -g -D_DEBUG endif -COMPSUFFIX = _mingw +COMPSUFFIX = _mingw -mklibfilename = $(shell echo $(1) | tr A-Z a-z)$(SOVERSION)$(COMPSUFFIX).dll +mklibfilename = $(shell echo $(1) | tr A-Z a-z)$(SOVERSION)$(COMPSUFFIX).dll ifeq ($(STATICLIBS),yes) mklibtargets = $(3) @@ -46,15 +46,15 @@ else mklibtargets = $(1) endif -mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) $(3) \ - $(subst cpp/lib,cpp/bin, \ - $(subst -lIce,-lice$(SOVERSION)$(COMPSUFFIX), \ - $(subst -lIceUtil,-liceutil$(SOVERSION)$(COMPSUFFIX), \ - $(subst -lSlice,-lslice$(SOVERSION)$(COMPSUFFIX), \ - $(subst -lIceSSL,-licessl$(SOVERSION)$(COMPSUFFIX), \ - $(subst -lIceDiscovery,-licediscovery$(SOVERSION)$(COMPSUFFIX),$(4))))))) +mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) $(3) \ + $(subst cpp/lib,cpp/bin, \ + $(subst -lIce,-lice$(SOVERSION)$(COMPSUFFIX), \ + $(subst -lIceUtil,-liceutil$(SOVERSION)$(COMPSUFFIX), \ + $(subst -lSlice,-lslice$(SOVERSION)$(COMPSUFFIX), \ + $(subst -lIceSSL,-licessl$(SOVERSION)$(COMPSUFFIX), \ + $(subst -lIceDiscovery,-licediscovery$(SOVERSION)$(COMPSUFFIX),$(4))))))) -mklib = ar cr $(1) $(2) +mklib = ar cr $(1) $(2) ifeq ($(LP64),yes) @@ -66,26 +66,26 @@ else endif ifneq ($(LP64),yes) -PLATFORM = Win32 +PLATFORM = Win32 else -PLATFORM = x64 +PLATFORM = x64 endif -PLATFORMTOOLSET = mingw4.7.2 -PKG_DIR = $(top_srcdir)/third-party-packages +PLATFORMTOOLSET = mingw4.7.2 +PKG_DIR = $(top_srcdir)/third-party-packages -BZIP2_VERSION = 1.0.6.1 -BZIP2_HOME = $(PKG_DIR)/bzip2.$(PLATFORMTOOLSET) -BZIP2_FLAGS = -I$(BZIP2_HOME)/build/native/include -BZIP2_LIBS = -L$(BZIP2_HOME)/build/native/bin/$(PLATFORM) -lbzip2$(COMPSUFFIX) -BZIP2_NUPKG = $(BZIP2_HOME)/bzip2.$(PLATFORMTOOLSET).nupkg +BZIP2_VERSION = 1.0.6.1 +BZIP2_HOME = $(PKG_DIR)/bzip2.$(PLATFORMTOOLSET) +BZIP2_FLAGS = -I$(BZIP2_HOME)/build/native/include +BZIP2_LIBS = -L$(BZIP2_HOME)/build/native/bin/$(PLATFORM) -lbzip2$(COMPSUFFIX) +BZIP2_NUPKG = $(BZIP2_HOME)/bzip2.$(PLATFORMTOOLSET).nupkg -MCPP_VERSION = 2.7.2.8 -MCPP_HOME = $(PKG_DIR)/mcpp.$(PLATFORMTOOLSET) -MCPP_LIBS = -L$(MCPP_HOME)/build/native/lib/$(PLATFORM) -lmcpp -MCPP_NUPKG = $(MCPP_HOME)/mcpp.$(PLATFORMTOOLSET).nupkg +MCPP_VERSION = 2.7.2.8 +MCPP_HOME = $(PKG_DIR)/mcpp.$(PLATFORMTOOLSET) +MCPP_LIBS = -L$(MCPP_HOME)/build/native/lib/$(PLATFORM) -lmcpp +MCPP_NUPKG = $(MCPP_HOME)/mcpp.$(PLATFORMTOOLSET).nupkg -NUGET = $(subst \,/,$(LOCALAPPDATA)/ZeroC/nuget/nuget.exe) +NUGET = $(subst \,/,$(LOCALAPPDATA)/ZeroC/nuget/nuget.exe) $(NUGET): @mkdir -p "$(LOCALAPPDATA)\ZeroC\nuget" @@ -101,29 +101,29 @@ $(MCPP_NUPKG): $(NUGET) @rm -rf "$(PKG_DIR)\mcpp.$(PLATFORMTOOLSET)" $(NUGET) install mcpp.$(PLATFORMTOOLSET) -OutputDirectory "$(PKG_DIR)" -ExcludeVersion -libdir := $(top_srcdir)/$(libsubdir) -bindir := $(top_srcdir)/$(binsubdir) +libdir := $(top_srcdir)/$(libsubdir) +bindir := $(top_srcdir)/$(binsubdir) -installlib = $(INSTALL) $(2)/$(3) $(1); \ - chmod a+rx $(1)/$(3) +installlib = $(INSTALL) $(2)/$(3) $(1); \ + chmod a+rx $(1)/$(3) -installprogram = $(INSTALL_PROGRAM) $(1) $(2); \ - chmod a+rx $(2)/$(notdir $(1)) +installprogram = $(INSTALL_PROGRAM) $(1) $(2); \ + chmod a+rx $(2)/$(notdir $(1)) -SSL_OS_LIBS = -lsecur32 -lcrypt32 -lws2_32 +SSL_OS_LIBS = -lsecur32 -lcrypt32 -lws2_32 ifeq ($(STATICLIBS),yes) -BASELIBS = -liceutil $(ICEUTIL_OS_LIBS) -LIBS = -lice $(BASELIBS) +BASELIBS = -liceutil $(ICEUTIL_OS_LIBS) +LIBS = -lice $(BASELIBS) ICESSL_LIBS = -licessl -SLICE_LIBS = -lslice $(BASELIBS) +SLICE_LIBS = -lslice $(BASELIBS) else -BASELIBS = -liceutil$(SOVERSION)$(COMPSUFFIX) $(ICEUTIL_OS_LIBS) -LIBS = -lice$(SOVERSION)$(COMPSUFFIX) $(BASELIBS) +BASELIBS = -liceutil$(SOVERSION)$(COMPSUFFIX) $(ICEUTIL_OS_LIBS) +LIBS = -lice$(SOVERSION)$(COMPSUFFIX) $(BASELIBS) ICESSL_LIBS = -licessl$(SOVERSION)$(COMPSUFFIX) -SLICE_LIBS = -lslice$(SOVERSION)$(COMPSUFFIX) $(BASELIBS) +SLICE_LIBS = -lslice$(SOVERSION)$(COMPSUFFIX) $(BASELIBS) endif -ICEUTIL_OS_LIBS = -lrpcrt4 -ladvapi32 -lshlwapi -ICE_OS_LIBS = $(ICEUTIL_OS_LIBS) -lIphlpapi -lws2_32 +ICEUTIL_OS_LIBS = -lrpcrt4 -ladvapi32 -lshlwapi +ICE_OS_LIBS = $(ICEUTIL_OS_LIBS) -lIphlpapi -lws2_32 EXE_EXT = .exe diff --git a/cpp/config/Make.xcodesdk.rules b/cpp/config/Make.xcodesdk.rules index 2cf7476e945..ab9bb6ae1fa 100644 --- a/cpp/config/Make.xcodesdk.rules +++ b/cpp/config/Make.xcodesdk.rules @@ -9,26 +9,26 @@ include $(top_srcdir)/config/Make.xcodesdk.rules -supported-configs += xcodesdk cpp11-xcodesdk +supported-configs += xcodesdk cpp11-xcodesdk -is-iostest-program = $(and $(filter-out macosx,$2),$(filter program,$($1_target))) +is-iostest-program = $(and $(filter-out macosx,$2),$(filter program,$($1_target))) # # Xcode configuration to build Xcode IceSDK. # -xcodesdk_targetdir = $(if $(filter %/build,$5),xcodesdk,$(if $(is-iostest-program),,IceSDK/$2.sdk/usr/lib)) -xcodesdk_installdir = $(if $(filter %/build,$5),xcodesdk,$(if $(is-iostest-program),,IceSDK/$2.sdk/usr/lib)) -xcodesdk_targetrule = $(if $(is-iostest-program),iostest,$(if $(filter-out program,$($1_target)),static)) +xcodesdk_targetdir = $(if $(filter %/build,$5),xcodesdk,$(if $(is-iostest-program),,IceSDK/$2.sdk/usr/lib)) +xcodesdk_installdir = $(if $(filter %/build,$5),xcodesdk,$(if $(is-iostest-program),,IceSDK/$2.sdk/usr/lib)) +xcodesdk_targetrule = $(if $(is-iostest-program),iostest,$(if $(filter-out program,$($1_target)),static)) -xcodesdk_components = Ice IceSSL Glacier2 IceStorm IceGrid IceDiscovery IceLocatorDiscovery IceIAP TestCommon -xcodesdk_projects = test/Ice/% test/IceSSL/configuration -xcodesdk_excludes = $(addprefix test/Ice/,background \ - faultTolerance \ - gc \ - logger \ - properties \ - stringConverter \ - threadPoolPriority) +xcodesdk_components = Ice IceSSL Glacier2 IceStorm IceGrid IceDiscovery IceLocatorDiscovery IceIAP TestCommon +xcodesdk_projects = test/Ice/% test/IceSSL/configuration +xcodesdk_excludes = $(addprefix test/Ice/,background \ + faultTolerance \ + gc \ + logger \ + properties \ + stringConverter \ + threadPoolPriority) # # Rule to build an iOS bundle for testing (this is used for packaging client/server programs) @@ -63,9 +63,9 @@ $(make-xcodesdk-component-with-config) ifneq ($$(and $(filter iphone%,$3),$(filter Ice,$2),$$(filter-out $$($2_sdk_includedirs),$3-IceUtil)),) $2_sdk_includedirs += $3-IceUtil $$(eval $$(call install-data-files,$$(wildcard include/IceUtil/*.h),include,\ - $(top_srcdir)/IceSDK/$3.sdk/usr/include,$5)) + $(top_srcdir)/IceSDK/$3.sdk/usr/include,$5)) $$(eval $$(call install-data-files,$$(wildcard include/IceUtil/*.h),include,\ - $(install_libdir)/IceSDK/$3.sdk/usr/include,$5_install)) + $(install_libdir)/IceSDK/$3.sdk/usr/include,$5_install)) endif $5_clean:: diff --git a/cpp/include/IceBT/Makefile b/cpp/include/IceBT/Makefile index b44afb207b4..74a6dc83aba 100644 --- a/cpp/include/IceBT/Makefile +++ b/cpp/include/IceBT/Makefile @@ -7,7 +7,7 @@ # # ********************************************************************** -top_srcdir = ../.. +top_srcdir = ../.. include $(top_srcdir)/config/Make.rules diff --git a/cpp/src/Glacier2/Makefile.mk b/cpp/src/Glacier2/Makefile.mk index 5e5fd221095..bb38b967be6 100644 --- a/cpp/src/Glacier2/Makefile.mk +++ b/cpp/src/Glacier2/Makefile.mk @@ -7,11 +7,11 @@ # # ********************************************************************** -$(project)_programs := glacier2router -$(project)_sliceflags := --include-dir Glacier2 +$(project)_programs := glacier2router +$(project)_sliceflags := --include-dir Glacier2 $(project)_generated_includedir := $(project)/generated/Glacier2 -$(project)_dependencies := Glacier2 IceSSL Ice +$(project)_dependencies := Glacier2 IceSSL Ice -glacier2router_targetdir := $(bindir) +glacier2router_targetdir := $(bindir) projects += $(project) diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk index cc150ee2908..7ebcc9f9ee6 100644 --- a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk +++ b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk @@ -7,10 +7,10 @@ # # ********************************************************************** -$(project)_libraries += Glacier2CryptPermissionsVerifier +$(project)_libraries += Glacier2CryptPermissionsVerifier -Glacier2CryptPermissionsVerifier_targetdir := $(libdir) -Glacier2CryptPermissionsVerifier_dependencies := Glacier2 Ice -Glacier2CryptPermissionsVerifier_cppflags := -DCRYPT_PERMISSIONS_VERIFIER_API_EXPORTS +Glacier2CryptPermissionsVerifier_targetdir := $(libdir) +Glacier2CryptPermissionsVerifier_dependencies := Glacier2 Ice +Glacier2CryptPermissionsVerifier_cppflags := -DCRYPT_PERMISSIONS_VERIFIER_API_EXPORTS projects += $(project) diff --git a/cpp/src/Glacier2Lib/Makefile.mk b/cpp/src/Glacier2Lib/Makefile.mk index ee38a48eba5..db1746bec29 100644 --- a/cpp/src/Glacier2Lib/Makefile.mk +++ b/cpp/src/Glacier2Lib/Makefile.mk @@ -7,11 +7,11 @@ # # ********************************************************************** -$(project)_libraries := Glacier2 +$(project)_libraries := Glacier2 -Glacier2_targetdir := $(libdir) -Glacier2_dependencies := Ice -Glacier2_cppflags := -DGLACIER2_API_EXPORTS -Glacier2_sliceflags := --include-dir Glacier2 +Glacier2_targetdir := $(libdir) +Glacier2_dependencies := Ice +Glacier2_cppflags := -DGLACIER2_API_EXPORTS +Glacier2_sliceflags := --include-dir Glacier2 projects += $(project) diff --git a/cpp/src/Ice/Makefile.mk b/cpp/src/Ice/Makefile.mk index b8f613fc1f3..d7f807a9f99 100644 --- a/cpp/src/Ice/Makefile.mk +++ b/cpp/src/Ice/Makefile.mk @@ -7,28 +7,28 @@ # # ********************************************************************** -$(project)_libraries = Ice +$(project)_libraries = Ice -Ice_targetdir := $(libdir) -Ice_cppflags = -DICE_API_EXPORTS $(IceUtil_cppflags) +Ice_targetdir := $(libdir) +Ice_cppflags = -DICE_API_EXPORTS $(IceUtil_cppflags) Ice_ldflags = $(iconv_ldflags) ifeq ($(DEFAULT_MUTEX_PROTOCOL), PrioInherit) Ice_cppflags += -DICE_PRIO_INHERIT endif -Ice_sliceflags := --include-dir Ice -Ice_libs := bz2 +Ice_sliceflags := --include-dir Ice +Ice_libs := bz2 Ice_extra_sources := $(wildcard src/IceUtil/*.cpp) -Ice_excludes = src/Ice/DLLMain.cpp +Ice_excludes = src/Ice/DLLMain.cpp ifeq ($(os),Darwin) Ice_excludes += src/IceUtil/ConvertUTF.cpp src/IceUtil/Unicode.cpp endif -Ice[iphoneos]_excludes := $(wildcard $(addprefix $(currentdir)/,Tcp*.cpp)) -Ice[iphoneos]_extra_sources := $(wildcard $(addprefix $(currentdir)/ios/,*.cpp *.mm)) -Ice[iphonesimulator]_excludes = $(Ice[iphoneos]_excludes) -Ice[iphonesimulator]_extra_sources = $(Ice[iphoneos]_extra_sources) +Ice[iphoneos]_excludes := $(wildcard $(addprefix $(currentdir)/,Tcp*.cpp)) +Ice[iphoneos]_extra_sources := $(wildcard $(addprefix $(currentdir)/ios/,*.cpp *.mm)) +Ice[iphonesimulator]_excludes = $(Ice[iphoneos]_excludes) +Ice[iphonesimulator]_extra_sources = $(Ice[iphoneos]_extra_sources) projects += $(project) diff --git a/cpp/src/IceBT/Makefile.mk b/cpp/src/IceBT/Makefile.mk index 8934def4122..f20f5ab5b15 100644 --- a/cpp/src/IceBT/Makefile.mk +++ b/cpp/src/IceBT/Makefile.mk @@ -9,13 +9,13 @@ ifneq ($(filter debian ubuntu yocto,$(linux_id)),) -$(project)_libraries := IceBT +$(project)_libraries := IceBT -IceBT_targetdir := $(libdir) -IceBT_dependencies := Ice -IceBT_cppflags := -DICEBT_API_EXPORTS $(shell pkg-config --cflags dbus-1) -IceBT_system_libs = $(IceSSL_system_libs) $(shell pkg-config --libs dbus-1) -IceBT_sliceflags := --include-dir IceBT +IceBT_targetdir := $(libdir) +IceBT_dependencies := Ice +IceBT_cppflags := -DICEBT_API_EXPORTS $(shell pkg-config --cflags dbus-1) +IceBT_system_libs = $(IceSSL_system_libs) $(shell pkg-config --libs dbus-1) +IceBT_sliceflags := --include-dir IceBT projects += $(project) diff --git a/cpp/src/IceBox/Makefile.mk b/cpp/src/IceBox/Makefile.mk index 7f9db662ad1..3afa222f7d7 100644 --- a/cpp/src/IceBox/Makefile.mk +++ b/cpp/src/IceBox/Makefile.mk @@ -7,20 +7,20 @@ # # ********************************************************************** -$(project)_libraries := IceBox -$(project)_programs := icebox iceboxadmin -$(project)_dependencies := Ice -$(project)_sliceflags := --include-dir IceBox +$(project)_libraries := IceBox +$(project)_programs := icebox iceboxadmin +$(project)_dependencies := Ice +$(project)_sliceflags := --include-dir IceBox -IceBox_targetdir := $(libdir) -IceBox_sources := $(slicedir)/IceBox/IceBox.ice $(currentdir)/Exception.cpp +IceBox_targetdir := $(libdir) +IceBox_sources := $(slicedir)/IceBox/IceBox.ice $(currentdir)/Exception.cpp -icebox_targetdir := $(bindir) -icebox_sources := $(currentdir)/Service.cpp $(currentdir)/ServiceManagerI.cpp -icebox_dependencies := IceBox +icebox_targetdir := $(bindir) +icebox_sources := $(currentdir)/Service.cpp $(currentdir)/ServiceManagerI.cpp +icebox_dependencies := IceBox -iceboxadmin_targetdir := $(bindir) -iceboxadmin_sources := $(currentdir)/Admin.cpp +iceboxadmin_targetdir := $(bindir) +iceboxadmin_sources := $(currentdir)/Admin.cpp iceboxadmin_dependencies:= IceBox projects += $(project) diff --git a/cpp/src/IceBridge/Makefile.mk b/cpp/src/IceBridge/Makefile.mk index 832b16729c5..0a1a472636e 100644 --- a/cpp/src/IceBridge/Makefile.mk +++ b/cpp/src/IceBridge/Makefile.mk @@ -7,9 +7,9 @@ # # ********************************************************************** -$(project)_programs := icebridge -$(project)_dependencies := Ice +$(project)_programs := icebridge +$(project)_dependencies := Ice -icebridge_targetdir := $(bindir) +icebridge_targetdir := $(bindir) projects += $(project) diff --git a/cpp/src/IceDB/Makefile.mk b/cpp/src/IceDB/Makefile.mk index b3f4a2893a1..fa8e18825ed 100644 --- a/cpp/src/IceDB/Makefile.mk +++ b/cpp/src/IceDB/Makefile.mk @@ -7,12 +7,12 @@ # # ********************************************************************** -$(project)_libraries = IceDB +$(project)_libraries = IceDB -IceDB_targetdir := $(libdir) -IceDB_dependencies := Ice -IceDB_libs := lmdb -IceDB_cppflags := -DICE_DB_API_EXPORTS +IceDB_targetdir := $(libdir) +IceDB_dependencies := Ice +IceDB_libs := lmdb +IceDB_cppflags := -DICE_DB_API_EXPORTS projects += $(project) diff --git a/cpp/src/IceDiscovery/Makefile.mk b/cpp/src/IceDiscovery/Makefile.mk index 00ebbb0712d..e7aa1a41ba1 100644 --- a/cpp/src/IceDiscovery/Makefile.mk +++ b/cpp/src/IceDiscovery/Makefile.mk @@ -9,10 +9,10 @@ $(project)_libraries := IceDiscovery -IceDiscovery_targetdir := $(libdir) -IceDiscovery_dependencies := Ice -IceDiscovery_sliceflags := --include-dir IceDiscovery -IceDiscovery_generated_includedir := $(project)/generated/IceDiscovery -IceDiscovery_cppflags := -DICE_DISCOVERY_API_EXPORTS +IceDiscovery_targetdir := $(libdir) +IceDiscovery_dependencies := Ice +IceDiscovery_sliceflags := --include-dir IceDiscovery +IceDiscovery_generated_includedir := $(project)/generated/IceDiscovery +IceDiscovery_cppflags := -DICE_DISCOVERY_API_EXPORTS projects += $(project) diff --git a/cpp/src/IceGrid/Makefile.mk b/cpp/src/IceGrid/Makefile.mk index f3758a17fe3..bd7f8c02362 100644 --- a/cpp/src/IceGrid/Makefile.mk +++ b/cpp/src/IceGrid/Makefile.mk @@ -7,80 +7,80 @@ # # ********************************************************************** -local_node_srcs = Activator.cpp \ - NodeAdminRouter.cpp \ - NodeI.cpp \ - NodeSessionManager.cpp \ - ServerAdapterI.cpp \ - ServerI.cpp +local_node_srcs = Activator.cpp \ + NodeAdminRouter.cpp \ + NodeI.cpp \ + NodeSessionManager.cpp \ + ServerAdapterI.cpp \ + ServerI.cpp -local_registry_srcs = Internal.ice \ - AdminRouter.cpp \ - DescriptorBuilder.cpp \ - DescriptorParser.cpp \ - FileCache.cpp \ - PlatformInfo.cpp \ - SessionManager.cpp \ - TraceLevels.cpp \ - AdminCallbackRouter.cpp \ - AdapterCache.cpp \ - AdminI.cpp \ - AdminSessionI.cpp \ - Allocatable.cpp \ - AllocatableObjectCache.cpp \ - Database.cpp \ - DescriptorHelper.cpp \ - FileUserAccountMapperI.cpp \ - InternalRegistryI.cpp \ - LocatorI.cpp \ - LocatorRegistryI.cpp \ - NodeCache.cpp \ - NodeSessionI.cpp \ - ObjectCache.cpp \ - PluginFacadeI.cpp \ - QueryI.cpp \ - ReapThread.cpp \ - RegistryAdminRouter.cpp \ - RegistryI.cpp \ - ReplicaCache.cpp \ - ReplicaSessionI.cpp \ - ReplicaSessionManager.cpp \ - ServerCache.cpp \ - SessionI.cpp \ - SessionServantManager.cpp \ - Topics.cpp \ - Util.cpp \ - WellKnownObjectsManager.cpp +local_registry_srcs = Internal.ice \ + AdminRouter.cpp \ + DescriptorBuilder.cpp \ + DescriptorParser.cpp \ + FileCache.cpp \ + PlatformInfo.cpp \ + SessionManager.cpp \ + TraceLevels.cpp \ + AdminCallbackRouter.cpp \ + AdapterCache.cpp \ + AdminI.cpp \ + AdminSessionI.cpp \ + Allocatable.cpp \ + AllocatableObjectCache.cpp \ + Database.cpp \ + DescriptorHelper.cpp \ + FileUserAccountMapperI.cpp \ + InternalRegistryI.cpp \ + LocatorI.cpp \ + LocatorRegistryI.cpp \ + NodeCache.cpp \ + NodeSessionI.cpp \ + ObjectCache.cpp \ + PluginFacadeI.cpp \ + QueryI.cpp \ + ReapThread.cpp \ + RegistryAdminRouter.cpp \ + RegistryI.cpp \ + ReplicaCache.cpp \ + ReplicaSessionI.cpp \ + ReplicaSessionManager.cpp \ + ServerCache.cpp \ + SessionI.cpp \ + SessionServantManager.cpp \ + Topics.cpp \ + Util.cpp \ + WellKnownObjectsManager.cpp -local_admin_srcs = Internal.ice \ - Client.cpp \ - DescriptorBuilder.cpp \ - DescriptorHelper.cpp \ - DescriptorParser.cpp \ - FileParserI.cpp \ - Grammar.cpp \ - Parser.cpp \ - Scanner.cpp \ - Util.cpp +local_admin_srcs = Internal.ice \ + Client.cpp \ + DescriptorBuilder.cpp \ + DescriptorHelper.cpp \ + DescriptorParser.cpp \ + FileParserI.cpp \ + Grammar.cpp \ + Parser.cpp \ + Scanner.cpp \ + Util.cpp -$(project)_programs = icegridnode icegridregistry icegridadmin -$(project)_sliceflags := -Isrc --include-dir IceGrid +$(project)_programs = icegridnode icegridregistry icegridadmin +$(project)_sliceflags := -Isrc --include-dir IceGrid $(project)_generated_includedir := $(project)/generated/IceGrid -$(project)_dependencies := IceGrid Glacier2 Ice -$(project)_targetdir := $(bindir) +$(project)_dependencies := IceGrid Glacier2 Ice +$(project)_targetdir := $(bindir) -icegridnode_sources := $(addprefix $(currentdir)/,$(local_node_srcs) $(local_registry_srcs) IceGridNode.cpp) \ +icegridnode_sources := $(addprefix $(currentdir)/,$(local_node_srcs) $(local_registry_srcs) IceGridNode.cpp) \ $(slicedir)/IceLocatorDiscovery/IceLocatorDiscovery.ice -icegridnode_dependencies := IceBox IceStormService IceStorm IceXML IceSSL IcePatch2 IceDB -icegridnode_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) +icegridnode_dependencies := IceBox IceStormService IceStorm IceXML IceSSL IcePatch2 IceDB +icegridnode_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) -icegridregistry_sources := $(addprefix $(currentdir)/,$(local_registry_srcs) IceGridRegistry.cpp) \ - $(slicedir)/IceLocatorDiscovery/IceLocatorDiscovery.ice -icegridregistry_dependencies := IceBox IceStormService IceStorm IceXML IceSSL IcePatch2 IceDB $(local_dependencies) -icegridregistry_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) +icegridregistry_sources := $(addprefix $(currentdir)/,$(local_registry_srcs) IceGridRegistry.cpp) \ + $(slicedir)/IceLocatorDiscovery/IceLocatorDiscovery.ice +icegridregistry_dependencies := IceBox IceStormService IceStorm IceXML IceSSL IcePatch2 IceDB $(local_dependencies) +icegridregistry_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) -icegridadmin_dependencies := IcePatch2 IceBox IceXML IceLocatorDiscovery -icegridadmin_sources := $(addprefix $(currentdir)/,$(local_admin_srcs)) +icegridadmin_dependencies := IcePatch2 IceBox IceXML IceLocatorDiscovery +icegridadmin_sources := $(addprefix $(currentdir)/,$(local_admin_srcs)) projects += $(project) diff --git a/cpp/src/IceGridLib/Makefile.mk b/cpp/src/IceGridLib/Makefile.mk index 8386ff8c42a..785cd1236a6 100644 --- a/cpp/src/IceGridLib/Makefile.mk +++ b/cpp/src/IceGridLib/Makefile.mk @@ -7,10 +7,10 @@ # # ********************************************************************** -$(project)_libraries := IceGrid +$(project)_libraries := IceGrid -IceGrid_targetdir := $(libdir) -IceGrid_dependencies := Glacier2 Ice -IceGrid_sliceflags := --include-dir IceGrid +IceGrid_targetdir := $(libdir) +IceGrid_dependencies := Glacier2 Ice +IceGrid_sliceflags := --include-dir IceGrid projects += $(project) diff --git a/cpp/src/IceIAP/Makefile.mk b/cpp/src/IceIAP/Makefile.mk index 8aa2164c111..4f89ecb8eb5 100644 --- a/cpp/src/IceIAP/Makefile.mk +++ b/cpp/src/IceIAP/Makefile.mk @@ -7,14 +7,14 @@ # # ********************************************************************** -$(project)_libraries = IceIAP +$(project)_libraries = IceIAP -IceIAP_configs := xcodesdk cpp11-xcodesdk -IceIAP_platforms := iphoneos iphonesimulator +IceIAP_configs := xcodesdk cpp11-xcodesdk +IceIAP_platforms := iphoneos iphonesimulator -IceIAP_targetdir := $(libdir) -IceIAP_dependencies := Ice -IceIAP_sliceflags := --include-dir IceIAP -IceIAP_cppflags := -DICEIAP_API_EXPORTS +IceIAP_targetdir := $(libdir) +IceIAP_dependencies := Ice +IceIAP_sliceflags := --include-dir IceIAP +IceIAP_cppflags := -DICEIAP_API_EXPORTS projects += $(project) diff --git a/cpp/src/IceLocatorDiscovery/Makefile.mk b/cpp/src/IceLocatorDiscovery/Makefile.mk index 4b708bb58dd..139d27fb599 100644 --- a/cpp/src/IceLocatorDiscovery/Makefile.mk +++ b/cpp/src/IceLocatorDiscovery/Makefile.mk @@ -9,10 +9,10 @@ $(project)_libraries := IceLocatorDiscovery -IceLocatorDiscovery_targetdir := $(libdir) -IceLocatorDiscovery_dependencies := Ice -IceLocatorDiscovery_sliceflags := --include-dir IceLocatorDiscovery -IceLocatorDiscovery_generated_includedir := $(project)/generated/IceLocatorDiscovery -IceLocatorDiscovery_cppflags := -DICE_LOCATOR_DISCOVERY_API_EXPORTS +IceLocatorDiscovery_targetdir := $(libdir) +IceLocatorDiscovery_dependencies := Ice +IceLocatorDiscovery_sliceflags := --include-dir IceLocatorDiscovery +IceLocatorDiscovery_generated_includedir := $(project)/generated/IceLocatorDiscovery +IceLocatorDiscovery_cppflags := -DICE_LOCATOR_DISCOVERY_API_EXPORTS projects += $(project) diff --git a/cpp/src/IcePatch2/Makefile.mk b/cpp/src/IcePatch2/Makefile.mk index bb37148a8aa..fe07e5b25d8 100644 --- a/cpp/src/IcePatch2/Makefile.mk +++ b/cpp/src/IcePatch2/Makefile.mk @@ -7,12 +7,12 @@ # # ********************************************************************** -$(project)_programs := icepatch2server icepatch2client icepatch2calc -$(project)_dependencies := IcePatch2 Ice -$(project)_targetdir := $(bindir) +$(project)_programs := icepatch2server icepatch2client icepatch2calc +$(project)_dependencies := IcePatch2 Ice +$(project)_targetdir := $(bindir) -icepatch2server_sources := $(addprefix $(currentdir)/,FileServerI.cpp Server.cpp) -icepatch2client_sources := $(addprefix $(currentdir)/,Client.cpp) -icepatch2calc_sources := $(addprefix $(currentdir)/,Calc.cpp) +icepatch2server_sources := $(addprefix $(currentdir)/,FileServerI.cpp Server.cpp) +icepatch2client_sources := $(addprefix $(currentdir)/,Client.cpp) +icepatch2calc_sources := $(addprefix $(currentdir)/,Calc.cpp) projects += $(project) diff --git a/cpp/src/IcePatch2Lib/Makefile.mk b/cpp/src/IcePatch2Lib/Makefile.mk index 3944f6b026c..20e9c5ab05e 100644 --- a/cpp/src/IcePatch2Lib/Makefile.mk +++ b/cpp/src/IcePatch2Lib/Makefile.mk @@ -7,12 +7,12 @@ # # ********************************************************************** -$(project)_libraries := IcePatch2 +$(project)_libraries := IcePatch2 -IcePatch2_targetdir := $(libdir) -IcePatch2_dependencies := Ice -IcePatch2_libs := bz2 -IcePatch2_sliceflags := --include-dir IcePatch2 -IcePatch2_cppflags := $(nodeprecatedwarnings-cppflags) +IcePatch2_targetdir := $(libdir) +IcePatch2_dependencies := Ice +IcePatch2_libs := bz2 +IcePatch2_sliceflags := --include-dir IcePatch2 +IcePatch2_cppflags := $(nodeprecatedwarnings-cppflags) projects += $(project) diff --git a/cpp/src/IceSSL/Makefile.mk b/cpp/src/IceSSL/Makefile.mk index da98ab6c2b3..9be9b79ead3 100644 --- a/cpp/src/IceSSL/Makefile.mk +++ b/cpp/src/IceSSL/Makefile.mk @@ -7,25 +7,25 @@ # # ********************************************************************** -$(project)_libraries := IceSSL +$(project)_libraries := IceSSL -IceSSL_targetdir := $(libdir) -IceSSL_dependencies := Ice -IceSSL_cppflags := -DICESSL_API_EXPORTS -IceSSL_sliceflags := --include-dir IceSSL +IceSSL_targetdir := $(libdir) +IceSSL_dependencies := Ice +IceSSL_cppflags := -DICESSL_API_EXPORTS +IceSSL_sliceflags := --include-dir IceSSL # # Exclude sources that are not build with the default # implementation. # -IceSSL_excludes += $(wildcard src/IceSSL/SChannel*.cpp) -IceSSL_excludes += $(wildcard src/IceSSL/UWP*.cpp) +IceSSL_excludes += $(wildcard src/IceSSL/SChannel*.cpp) +IceSSL_excludes += $(wildcard src/IceSSL/UWP*.cpp) ifeq ($(os),Darwin) -IceSSL_excludes += $(wildcard src/IceSSL/OpenSSL*.cpp) +IceSSL_excludes += $(wildcard src/IceSSL/OpenSSL*.cpp) else -IceSSL_cppflags += -DICESSL_OPENSSL_API_EXPORTS -IceSSL_excludes += $(wildcard src/IceSSL/SecureTransport*.cpp) +IceSSL_cppflags += -DICESSL_OPENSSL_API_EXPORTS +IceSSL_excludes += $(wildcard src/IceSSL/SecureTransport*.cpp) endif projects += $(project) diff --git a/cpp/src/IceStorm/Makefile.mk b/cpp/src/IceStorm/Makefile.mk index db136b5b8ec..34ac74a7015 100644 --- a/cpp/src/IceStorm/Makefile.mk +++ b/cpp/src/IceStorm/Makefile.mk @@ -7,48 +7,48 @@ # # ********************************************************************** -$(project)_libraries := IceStormService -$(project)_programs := icestormadmin icestormdb -$(project)_sliceflags := -Isrc --include-dir IceStorm +$(project)_libraries := IceStormService +$(project)_programs := icestormadmin icestormdb +$(project)_sliceflags := -Isrc --include-dir IceStorm $(project)_generated_includedir := $(project)/generated/IceStorm -$(project)_dependencies := IceStorm Ice +$(project)_dependencies := IceStorm Ice -IceStormService_targetdir := $(libdir) -IceStormService_dependencies := IceGrid Glacier2 IceBox IceDB -IceStormService_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) -IceStormService_sources := $(addprefix $(currentdir)/,Instance.cpp \ - InstrumentationI.cpp \ - NodeI.cpp \ - Observers.cpp \ - Service.cpp \ - Subscriber.cpp \ - TopicI.cpp \ - TopicManagerI.cpp \ - TraceLevels.cpp \ - TransientTopicI.cpp \ - TransientTopicManagerI.cpp \ - Util.cpp \ - Election.ice \ - IceStormInternal.ice \ - Instrumentation.ice \ - LinkRecord.ice \ - LLURecord.ice \ - SubscriberRecord.ice \ - DBTypes.ice) +IceStormService_targetdir := $(libdir) +IceStormService_dependencies := IceGrid Glacier2 IceBox IceDB +IceStormService_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) +IceStormService_sources := $(addprefix $(currentdir)/,Instance.cpp \ + InstrumentationI.cpp \ + NodeI.cpp \ + Observers.cpp \ + Service.cpp \ + Subscriber.cpp \ + TopicI.cpp \ + TopicManagerI.cpp \ + TraceLevels.cpp \ + TransientTopicI.cpp \ + TransientTopicManagerI.cpp \ + Util.cpp \ + Election.ice \ + IceStormInternal.ice \ + Instrumentation.ice \ + LinkRecord.ice \ + LLURecord.ice \ + SubscriberRecord.ice \ + DBTypes.ice) -icestormadmin_targetdir := $(bindir) -icestormadmin_sources := $(addprefix $(currentdir)/,Admin.cpp \ - Grammar.y \ - Parser.cpp \ - Scanner.l \ - LLURecord.ice \ - SubscriberRecord.ice \ - Election.ice \ - IceStormInternal.ice) +icestormadmin_targetdir := $(bindir) +icestormadmin_sources := $(addprefix $(currentdir)/,Admin.cpp \ + Grammar.y \ + Parser.cpp \ + Scanner.l \ + LLURecord.ice \ + SubscriberRecord.ice \ + Election.ice \ + IceStormInternal.ice) -icestormdb_targetdir := $(bindir) -icestormdb_dependencies := IcePatch2 IceDB -icestormdb_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) -icestormdb_sources := $(addprefix $(currentdir)/,IceStormDB.cpp DBTypes.ice) +icestormdb_targetdir := $(bindir) +icestormdb_dependencies := IcePatch2 IceDB +icestormdb_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) +icestormdb_sources := $(addprefix $(currentdir)/,IceStormDB.cpp DBTypes.ice) projects += $(project) diff --git a/cpp/src/IceStormLib/Makefile.mk b/cpp/src/IceStormLib/Makefile.mk index 01a54fefc92..5ef610d4aa0 100644 --- a/cpp/src/IceStormLib/Makefile.mk +++ b/cpp/src/IceStormLib/Makefile.mk @@ -7,10 +7,10 @@ # # ********************************************************************** -$(project)_libraries := IceStorm +$(project)_libraries := IceStorm -IceStorm_targetdir := $(libdir) -IceStorm_dependencies := Ice -IceStorm_sliceflags := --include-dir IceStorm +IceStorm_targetdir := $(libdir) +IceStorm_dependencies := Ice +IceStorm_sliceflags := --include-dir IceStorm projects += $(project) diff --git a/cpp/src/IceUtil/Makefile.mk b/cpp/src/IceUtil/Makefile.mk index ec19f637898..de5b761145a 100644 --- a/cpp/src/IceUtil/Makefile.mk +++ b/cpp/src/IceUtil/Makefile.mk @@ -7,10 +7,10 @@ # # ********************************************************************** -$(project)_libraries = IceUtil +$(project)_libraries = IceUtil -IceUtil_targetdir := $(libdir) -IceUtil_cppflags := $(if $(filter yes,$(libbacktrace)),-DICE_LIBBACKTRACE) +IceUtil_targetdir := $(libdir) +IceUtil_cppflags := $(if $(filter yes,$(libbacktrace)),-DICE_LIBBACKTRACE) ifeq ($(os),Darwin) IceUtil_excludes = src/IceUtil/ConvertUTF.cpp src/IceUtil/Unicode.cpp @@ -18,8 +18,8 @@ endif # Always enable the static configuration for the IceUtil library and never # install it. -IceUtil_always_enable_configs := static +IceUtil_always_enable_configs := static IceUtil_always_enable_platforms := $(build-platform) -IceUtil_install_configs := none +IceUtil_install_configs := none projects += $(project) diff --git a/cpp/src/IceXML/Makefile.mk b/cpp/src/IceXML/Makefile.mk index 666e56d1242..a62e55d9fa4 100644 --- a/cpp/src/IceXML/Makefile.mk +++ b/cpp/src/IceXML/Makefile.mk @@ -7,11 +7,11 @@ # # ********************************************************************** -$(project)_libraries := IceXML +$(project)_libraries := IceXML -IceXML_targetdir := $(libdir) -IceXML_dependencies := Ice -IceXML_cppflags := -DICE_XML_API_EXPORTS -IceXML_libs := expat +IceXML_targetdir := $(libdir) +IceXML_dependencies := Ice +IceXML_cppflags := -DICE_XML_API_EXPORTS +IceXML_libs := expat projects += $(project) diff --git a/cpp/src/Slice/Makefile.mk b/cpp/src/Slice/Makefile.mk index 809910a395a..b242a7ac094 100644 --- a/cpp/src/Slice/Makefile.mk +++ b/cpp/src/Slice/Makefile.mk @@ -7,16 +7,16 @@ # # ********************************************************************** -$(project)_libraries := Slice +$(project)_libraries := Slice -Slice_targetdir := $(libdir) -Slice_libs := mcpp +Slice_targetdir := $(libdir) +Slice_libs := mcpp # Always enable the static configuration for the Slice library and never # install it -Slice_always_enable_configs := static -Slice_always_enable_platforms := $(build-platform) -Slice_install_configs := none -Slice_bisonflags := --name-prefix "slice_" +Slice_always_enable_configs := static +Slice_always_enable_platforms := $(build-platform) +Slice_install_configs := none +Slice_bisonflags := --name-prefix "slice_" projects += $(project) diff --git a/cpp/src/icegriddb/Makefile.mk b/cpp/src/icegriddb/Makefile.mk index a1c382f863f..258617affd9 100644 --- a/cpp/src/icegriddb/Makefile.mk +++ b/cpp/src/icegriddb/Makefile.mk @@ -16,7 +16,7 @@ $(project)/generated/DBTypes.cpp: $(includedir)/generated/IceGrid/Admin.h icegriddb_targetdir := $(bindir) icegriddb_dependencies := Ice IceDB Glacier2 -icegriddb_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) +icegriddb_cppflags := $(if $(lmdb_includedir),-I$(lmdb_includedir)) icegriddb_sources := $(addprefix $(slicedir)/IceGrid/,Descriptor.ice Exception.ice) \ $(addprefix $(currentdir)/,IceGridDB.cpp DBTypes.ice) diff --git a/cpp/test/Common/Makefile.mk b/cpp/test/Common/Makefile.mk index b9666d51d2f..e76aded7f96 100644 --- a/cpp/test/Common/Makefile.mk +++ b/cpp/test/Common/Makefile.mk @@ -7,15 +7,15 @@ # # ********************************************************************** -$(project)_libraries = TestCommon -$(project)_noinstall := 1 +$(project)_libraries = TestCommon +$(project)_noinstall := 1 # # Put the shared TestCommon library in the lib directory for convenience on platforms # which don't support something like @loader_path. # -TestCommon[shared]_targetdir := lib -TestCommon_dependencies := Ice -TestCommon_cppflags := -DTEST_API_EXPORTS -I$(includedir) -I$(project) -Itest/include +TestCommon[shared]_targetdir := lib +TestCommon_dependencies := Ice +TestCommon_cppflags := -DTEST_API_EXPORTS -I$(includedir) -I$(project) -Itest/include projects += $(project) diff --git a/cpp/test/Ice/background/Makefile.mk b/cpp/test/Ice/background/Makefile.mk index b25b873de26..98d85105a0e 100644 --- a/cpp/test/Ice/background/Makefile.mk +++ b/cpp/test/Ice/background/Makefile.mk @@ -7,22 +7,22 @@ # # ********************************************************************** -$(test)_libraries := $(test)_TestTransport -$(test)_cppflags := -I$(srcdir) +$(test)_libraries := $(test)_TestTransport +$(test)_cppflags := -I$(srcdir) -$(test)_client_sources = Client.cpp AllTests.cpp -$(test)_client_dependencies := $(test)_TestTransport +$(test)_client_sources = Client.cpp AllTests.cpp +$(test)_client_dependencies := $(test)_TestTransport -$(test)_server_sources = Server.cpp TestI.cpp -$(test)_server_dependencies := $(test)_TestTransport +$(test)_server_sources = Server.cpp TestI.cpp +$(test)_server_dependencies := $(test)_TestTransport $(test)_TestTransport_sources = Test.ice \ - Configuration.cpp \ - Connector.cpp \ - Acceptor.cpp \ - EndpointI.cpp \ - Transceiver.cpp \ - EndpointFactory.cpp \ - PluginI.cpp + Configuration.cpp \ + Connector.cpp \ + Acceptor.cpp \ + EndpointI.cpp \ + Transceiver.cpp \ + EndpointFactory.cpp \ + PluginI.cpp tests += $(test) diff --git a/cpp/test/Ice/checksum/Makefile.mk b/cpp/test/Ice/checksum/Makefile.mk index 09453fc30b5..9550c05bd3e 100644 --- a/cpp/test/Ice/checksum/Makefile.mk +++ b/cpp/test/Ice/checksum/Makefile.mk @@ -7,8 +7,8 @@ # # ********************************************************************** -$(test)_sliceflags = --checksum -$(test)_client_sources = $(test-client-sources) ClientTypes.ice -$(test)_server_sources = $(test-server-sources) ServerTypes.ice +$(test)_sliceflags = --checksum +$(test)_client_sources = $(test-client-sources) ClientTypes.ice +$(test)_server_sources = $(test-server-sources) ServerTypes.ice tests += $(test) diff --git a/cpp/test/Ice/custom/Makefile.mk b/cpp/test/Ice/custom/Makefile.mk index c9806fb6ec6..0dd25b7728d 100644 --- a/cpp/test/Ice/custom/Makefile.mk +++ b/cpp/test/Ice/custom/Makefile.mk @@ -7,27 +7,27 @@ # # ********************************************************************** -$(test)_client_sources = Client.cpp \ - AllTests.cpp \ - Test.ice \ - Wstring.ice \ - MyByteSeq.cpp \ - StringConverterI.cpp +$(test)_client_sources = Client.cpp \ + AllTests.cpp \ + Test.ice \ + Wstring.ice \ + MyByteSeq.cpp \ + StringConverterI.cpp -$(test)_server_sources = Server.cpp \ - TestI.cpp \ - WstringI.cpp \ - Test.ice \ - Wstring.ice \ - MyByteSeq.cpp \ - StringConverterI.cpp +$(test)_server_sources = Server.cpp \ + TestI.cpp \ + WstringI.cpp \ + Test.ice \ + Wstring.ice \ + MyByteSeq.cpp \ + StringConverterI.cpp -$(test)_serveramd_sources = ServerAMD.cpp \ - TestAMDI.cpp \ - WstringAMDI.cpp \ - TestAMD.ice \ - WstringAMD.ice \ - MyByteSeq.cpp \ - StringConverterI.cpp +$(test)_serveramd_sources = ServerAMD.cpp \ + TestAMDI.cpp \ + WstringAMDI.cpp \ + TestAMD.ice \ + WstringAMD.ice \ + MyByteSeq.cpp \ + StringConverterI.cpp tests += $(test) diff --git a/cpp/test/Ice/echo/Makefile.mk b/cpp/test/Ice/echo/Makefile.mk index 2eca6465fa6..f5c6082af3f 100644 --- a/cpp/test/Ice/echo/Makefile.mk +++ b/cpp/test/Ice/echo/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_server_sources = Test.ice BlobjectI.cpp Server.cpp +$(test)_server_sources = Test.ice BlobjectI.cpp Server.cpp tests += $(test) diff --git a/cpp/test/Ice/impl/Makefile.mk b/cpp/test/Ice/impl/Makefile.mk index e814e47c2f9..d95e9015bf3 100644 --- a/cpp/test/Ice/impl/Makefile.mk +++ b/cpp/test/Ice/impl/Makefile.mk @@ -7,8 +7,8 @@ # # ********************************************************************** -$(test)_server_impl = Test -$(test)_serveramd_impl = TestAMD +$(test)_server_impl = Test +$(test)_serveramd_impl = TestAMD # # $(call make-impl-with-config,$1=project,$2=component,$3=platform,$4=config,$5=comp[platform-config]) @@ -16,9 +16,9 @@ $(test)_serveramd_impl = TestAMD define make-impl-with-config ifneq ($$($2_impl),) -$5_sources += $$($5_objdir)/$$($2_impl)I.cpp -$5_objects += $$(addprefix $$($5_objdir)/,$$(call source-to-object,$$($5_objdir)/$$($2_impl)I.cpp)) -$5_cppflags += -I$$($5_objdir) +$5_sources += $$($5_objdir)/$$($2_impl)I.cpp +$5_objects += $$(addprefix $$($5_objdir)/,$$(call source-to-object,$$($5_objdir)/$$($2_impl)I.cpp)) +$5_cppflags += -I$$($5_objdir) $$($5_objects): $$($5_objdir)/$$($2_impl)I.cpp diff --git a/cpp/test/Ice/library/Makefile.mk b/cpp/test/Ice/library/Makefile.mk index 88f2364cde6..61ac317b125 100644 --- a/cpp/test/Ice/library/Makefile.mk +++ b/cpp/test/Ice/library/Makefile.mk @@ -9,15 +9,15 @@ $(test)_libraries := $(test)_GenCode $(test)_Consumer $(test)_AllTests -$(test)_GenCode_sources := Test.ice +$(test)_GenCode_sources := Test.ice -$(test)_Consumer_sources := Consumer.cpp -$(test)_Consumer_dependencies := $(test)_GenCode +$(test)_Consumer_sources := Consumer.cpp +$(test)_Consumer_dependencies := $(test)_GenCode -$(test)_AllTests_sources := AllTests.cpp -$(test)_AllTests_dependencies := $(test)_GenCode $(test)_Consumer +$(test)_AllTests_sources := AllTests.cpp +$(test)_AllTests_dependencies := $(test)_GenCode $(test)_Consumer $(test)_client_sources := Client.cpp -$(test)_client_dependencies := $(test)_AllTests +$(test)_client_dependencies := $(test)_AllTests tests += $(test) diff --git a/cpp/test/Ice/logger/Makefile.mk b/cpp/test/Ice/logger/Makefile.mk index 9735f51b50c..86b55596f39 100644 --- a/cpp/test/Ice/logger/Makefile.mk +++ b/cpp/test/Ice/logger/Makefile.mk @@ -7,8 +7,8 @@ # # ********************************************************************** -$(test)_programs = client1 client2 client3 client4 client5 -$(test)_libs = iconv +$(test)_programs = client1 client2 client3 client4 client5 +$(test)_libs = iconv $(test)_client1_sources = Client1.cpp $(test)_client2_sources = Client2.cpp diff --git a/cpp/test/Ice/objects/Makefile.mk b/cpp/test/Ice/objects/Makefile.mk index ac315fa695b..9cbae24e215 100644 --- a/cpp/test/Ice/objects/Makefile.mk +++ b/cpp/test/Ice/objects/Makefile.mk @@ -7,9 +7,9 @@ # # ********************************************************************** -$(test)_sliceflags := -I$(test) -$(test)_client_sources = Client.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp AllTests.cpp -$(test)_server_sources = Server.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp -$(test)_collocated_sources = Collocated.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp AllTests.cpp +$(test)_sliceflags := -I$(test) +$(test)_client_sources = Client.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp AllTests.cpp +$(test)_server_sources = Server.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp +$(test)_collocated_sources = Collocated.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp AllTests.cpp tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/operations/Makefile.mk b/cpp/test/Ice/operations/Makefile.mk index df098984495..237dab428bd 100644 --- a/cpp/test/Ice/operations/Makefile.mk +++ b/cpp/test/Ice/operations/Makefile.mk @@ -7,15 +7,15 @@ # # ********************************************************************** -$(test)_client_sources = Test.ice \ - Client.cpp \ - AllTests.cpp \ - Twoways.cpp \ - Oneways.cpp \ - TwowaysAMI.cpp \ - OnewaysAMI.cpp \ - BatchOneways.cpp \ - BatchOnewaysAMI.cpp +$(test)_client_sources = Test.ice \ + Client.cpp \ + AllTests.cpp \ + Twoways.cpp \ + Oneways.cpp \ + TwowaysAMI.cpp \ + OnewaysAMI.cpp \ + BatchOneways.cpp \ + BatchOnewaysAMI.cpp ifeq ($(xlc_compiler),yes) $(test)_cppflags += -qsuppress="1540-0895" diff --git a/cpp/test/Ice/plugin/Makefile.mk b/cpp/test/Ice/plugin/Makefile.mk index f6ba5fbc9a2..af482decc84 100644 --- a/cpp/test/Ice/plugin/Makefile.mk +++ b/cpp/test/Ice/plugin/Makefile.mk @@ -7,7 +7,7 @@ # # ********************************************************************** -$(test)_libraries := $(test)_TestPlugin +$(test)_libraries := $(test)_TestPlugin $(test)_TestPlugin_sources := Plugin.cpp diff --git a/cpp/test/Ice/slicing/exceptions/Makefile.mk b/cpp/test/Ice/slicing/exceptions/Makefile.mk index 0aea7ea7bd2..94b1fad8905 100644 --- a/cpp/test/Ice/slicing/exceptions/Makefile.mk +++ b/cpp/test/Ice/slicing/exceptions/Makefile.mk @@ -7,9 +7,9 @@ # # ********************************************************************** -$(test)_sliceflags := -I$(test) -$(test)_client_sources = $(test-client-sources) ClientPrivate.ice -$(test)_server_sources = $(test-server-sources) ServerPrivate.ice -$(test)_serveramd_sources = $(test-serveramd-sources) ServerPrivateAMD.ice +$(test)_sliceflags := -I$(test) +$(test)_client_sources = $(test-client-sources) ClientPrivate.ice +$(test)_server_sources = $(test-server-sources) ServerPrivate.ice +$(test)_serveramd_sources = $(test-serveramd-sources) ServerPrivateAMD.ice tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/Makefile.mk b/cpp/test/Ice/slicing/objects/Makefile.mk index 0aea7ea7bd2..94b1fad8905 100644 --- a/cpp/test/Ice/slicing/objects/Makefile.mk +++ b/cpp/test/Ice/slicing/objects/Makefile.mk @@ -7,9 +7,9 @@ # # ********************************************************************** -$(test)_sliceflags := -I$(test) -$(test)_client_sources = $(test-client-sources) ClientPrivate.ice -$(test)_server_sources = $(test-server-sources) ServerPrivate.ice -$(test)_serveramd_sources = $(test-serveramd-sources) ServerPrivateAMD.ice +$(test)_sliceflags := -I$(test) +$(test)_client_sources = $(test-client-sources) ClientPrivate.ice +$(test)_server_sources = $(test-server-sources) ServerPrivate.ice +$(test)_serveramd_sources = $(test-serveramd-sources) ServerPrivateAMD.ice tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/threadPoolPriority/Makefile.mk b/cpp/test/Ice/threadPoolPriority/Makefile.mk index 3c30722bcab..4dfed32a0c4 100644 --- a/cpp/test/Ice/threadPoolPriority/Makefile.mk +++ b/cpp/test/Ice/threadPoolPriority/Makefile.mk @@ -9,6 +9,6 @@ $(test)_programs := client server servercustom -$(test)_servercustom_sources := ServerCustomThreadPool.cpp Test.ice TestI.cpp +$(test)_servercustom_sources := ServerCustomThreadPool.cpp Test.ice TestI.cpp tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceBox/admin/Makefile.mk b/cpp/test/IceBox/admin/Makefile.mk index fee07a3380d..f3e2d7cb48e 100644 --- a/cpp/test/IceBox/admin/Makefile.mk +++ b/cpp/test/IceBox/admin/Makefile.mk @@ -9,9 +9,9 @@ $(test)_libraries := $(test)_TestService -$(test)_TestService_sources = TestI.cpp Service.cpp Test.ice -$(test)_TestService_dependencies = IceBox -$(test)_TestService_version = -$(test)_TestService_soversion = +$(test)_TestService_sources = TestI.cpp Service.cpp Test.ice +$(test)_TestService_dependencies = IceBox +$(test)_TestService_version = +$(test)_TestService_soversion = tests += $(test) diff --git a/cpp/test/IceBox/configuration/Makefile.mk b/cpp/test/IceBox/configuration/Makefile.mk index fee07a3380d..f3e2d7cb48e 100644 --- a/cpp/test/IceBox/configuration/Makefile.mk +++ b/cpp/test/IceBox/configuration/Makefile.mk @@ -9,9 +9,9 @@ $(test)_libraries := $(test)_TestService -$(test)_TestService_sources = TestI.cpp Service.cpp Test.ice -$(test)_TestService_dependencies = IceBox -$(test)_TestService_version = -$(test)_TestService_soversion = +$(test)_TestService_sources = TestI.cpp Service.cpp Test.ice +$(test)_TestService_dependencies = IceBox +$(test)_TestService_version = +$(test)_TestService_soversion = tests += $(test) diff --git a/cpp/test/IceGrid/deployer/Makefile.mk b/cpp/test/IceGrid/deployer/Makefile.mk index 92d4168f223..7b6f23f2e8e 100644 --- a/cpp/test/IceGrid/deployer/Makefile.mk +++ b/cpp/test/IceGrid/deployer/Makefile.mk @@ -9,10 +9,10 @@ $(test)_libraries := $(test)_TestService -$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice +$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice $(test)_TestService_dependencies = IceBox -$(test)_TestService_version = -$(test)_TestService_soversion = +$(test)_TestService_version = +$(test)_TestService_soversion = $(test)_client_dependencies = IceGrid Glacier2 diff --git a/cpp/test/IceGrid/noRestartUpdate/Makefile.mk b/cpp/test/IceGrid/noRestartUpdate/Makefile.mk index 92d4168f223..7b6f23f2e8e 100644 --- a/cpp/test/IceGrid/noRestartUpdate/Makefile.mk +++ b/cpp/test/IceGrid/noRestartUpdate/Makefile.mk @@ -9,10 +9,10 @@ $(test)_libraries := $(test)_TestService -$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice +$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice $(test)_TestService_dependencies = IceBox -$(test)_TestService_version = -$(test)_TestService_soversion = +$(test)_TestService_version = +$(test)_TestService_soversion = $(test)_client_dependencies = IceGrid Glacier2 diff --git a/cpp/test/IceGrid/replicaGroup/Makefile.mk b/cpp/test/IceGrid/replicaGroup/Makefile.mk index 17a64e3dda1..680829b6ece 100644 --- a/cpp/test/IceGrid/replicaGroup/Makefile.mk +++ b/cpp/test/IceGrid/replicaGroup/Makefile.mk @@ -9,14 +9,14 @@ $(test)_libraries := $(test)_TestService $(test)_RegistryPlugin -$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice -$(test)_TestService_dependencies = IceBox -$(test)_TestService_version = -$(test)_TestService_soversion = +$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice +$(test)_TestService_dependencies = IceBox +$(test)_TestService_version = +$(test)_TestService_soversion = -$(test)_RegistryPlugin_sources = RegistryPlugin.cpp -$(test)_RegistryPlugin_dependencies = IceGrid Glacier2 +$(test)_RegistryPlugin_sources = RegistryPlugin.cpp +$(test)_RegistryPlugin_dependencies = IceGrid Glacier2 -$(test)_client_dependencies = IceGrid Glacier2 +$(test)_client_dependencies = IceGrid Glacier2 tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceGrid/session/Makefile.mk b/cpp/test/IceGrid/session/Makefile.mk index 9efb2c5caf1..3b6a9a5eb4c 100644 --- a/cpp/test/IceGrid/session/Makefile.mk +++ b/cpp/test/IceGrid/session/Makefile.mk @@ -9,11 +9,11 @@ $(test)_programs = client server verifier -$(test)_client_dependencies = IceGrid Glacier2 +$(test)_client_dependencies = IceGrid Glacier2 -$(test)_server_dependencies = Glacier2 IceSSL +$(test)_server_dependencies = Glacier2 IceSSL -$(test)_verifier_sources = PermissionsVerifier.cpp Test.ice -$(test)_verifier_dependencies = Glacier2 +$(test)_verifier_sources = PermissionsVerifier.cpp Test.ice +$(test)_verifier_dependencies = Glacier2 tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceSSL/configuration/Makefile.mk b/cpp/test/IceSSL/configuration/Makefile.mk index 6d343c5060b..a0bb83fb19e 100644 --- a/cpp/test/IceSSL/configuration/Makefile.mk +++ b/cpp/test/IceSSL/configuration/Makefile.mk @@ -10,7 +10,7 @@ $(test)_dependencies = IceSSL Ice TestCommon # Need to load certificates with functions from src/IceSSL/Util.h -$(test)[iphoneos]_cppflags := -Isrc -$(test)[iphonesimulator]_cppflags := -Isrc +$(test)[iphoneos]_cppflags := -Isrc +$(test)[iphonesimulator]_cppflags := -Isrc tests += $(test) diff --git a/cpp/test/IceStorm/federation/Makefile.mk b/cpp/test/IceStorm/federation/Makefile.mk index eb14bf257dc..d1e5e23feab 100644 --- a/cpp/test/IceStorm/federation/Makefile.mk +++ b/cpp/test/IceStorm/federation/Makefile.mk @@ -7,11 +7,11 @@ # # ********************************************************************** -$(test)_programs = publisher subscriber -$(test)_dependencies = IceStorm Ice TestCommon +$(test)_programs = publisher subscriber +$(test)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Event.ice -$(test)_subscriber_sources = Subscriber.cpp Event.ice +$(test)_publisher_sources = Publisher.cpp Event.ice +$(test)_subscriber_sources = Subscriber.cpp Event.ice $(test)_cleanfiles = db/* 0.db/* 1.db/* 2.db/* diff --git a/cpp/test/IceStorm/federation2/Makefile.mk b/cpp/test/IceStorm/federation2/Makefile.mk index 62787683f1f..93f8e4b8ad2 100644 --- a/cpp/test/IceStorm/federation2/Makefile.mk +++ b/cpp/test/IceStorm/federation2/Makefile.mk @@ -7,11 +7,11 @@ # # ********************************************************************** -$(test)_programs = publisher subscriber -$(test)_dependencies = IceStorm Ice TestCommon +$(test)_programs = publisher subscriber +$(test)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Event.ice -$(test)_subscriber_sources = Subscriber.cpp Event.ice +$(test)_publisher_sources = Publisher.cpp Event.ice +$(test)_subscriber_sources = Subscriber.cpp Event.ice $(test)_cleanfiles = db/* 0.db/* 1.db/* 2.db/* db2/* 0.db2/* 1.db2/* 2.db2/* diff --git a/cpp/test/IceStorm/rep1/Makefile.mk b/cpp/test/IceStorm/rep1/Makefile.mk index f0a87e294ed..c0c73312cd6 100644 --- a/cpp/test/IceStorm/rep1/Makefile.mk +++ b/cpp/test/IceStorm/rep1/Makefile.mk @@ -7,12 +7,12 @@ # # ********************************************************************** -$(test)_programs = publisher subscriber sub -$(test)_dependencies = IceStorm Ice TestCommon +$(test)_programs = publisher subscriber sub +$(test)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Single.ice -$(test)_subscriber_sources = Subscriber.cpp Single.ice -$(test)_sub_sources = Sub.cpp Single.ice +$(test)_publisher_sources = Publisher.cpp Single.ice +$(test)_subscriber_sources = Subscriber.cpp Single.ice +$(test)_sub_sources = Sub.cpp Single.ice $(test)_cleanfiles = 0.db/* 1.db/* 2.db/* diff --git a/cpp/test/IceStorm/repgrid/Makefile.mk b/cpp/test/IceStorm/repgrid/Makefile.mk index 352c683d439..ec44f471cf9 100644 --- a/cpp/test/IceStorm/repgrid/Makefile.mk +++ b/cpp/test/IceStorm/repgrid/Makefile.mk @@ -7,8 +7,8 @@ # # ********************************************************************** -$(test)_dependencies = IceStorm Ice TestCommon +$(test)_dependencies = IceStorm Ice TestCommon -$(test)_client_sources = Client.cpp Single.ice +$(test)_client_sources = Client.cpp Single.ice tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/Makefile.mk b/cpp/test/IceStorm/repstress/Makefile.mk index 862e7e80a7d..06630b48f47 100644 --- a/cpp/test/IceStorm/repstress/Makefile.mk +++ b/cpp/test/IceStorm/repstress/Makefile.mk @@ -7,12 +7,12 @@ # # ********************************************************************** -$(test)_programs = publisher subscriber control -$(test)_dependencies = IceStorm Ice TestCommon +$(test)_programs = publisher subscriber control +$(test)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Single.ice Controller.ice -$(test)_subscriber_sources = Subscriber.cpp Single.ice Controller.ice -$(test)_control_sources = Control.cpp Controller.ice +$(test)_publisher_sources = Publisher.cpp Single.ice Controller.ice +$(test)_subscriber_sources = Subscriber.cpp Single.ice Controller.ice +$(test)_control_sources = Control.cpp Controller.ice $(test)_cleanfiles = 0.db/* 1.db/* 2.db/* diff --git a/cpp/test/IceStorm/single/Makefile.mk b/cpp/test/IceStorm/single/Makefile.mk index 74e1a2442b6..2e8d2fdf117 100644 --- a/cpp/test/IceStorm/single/Makefile.mk +++ b/cpp/test/IceStorm/single/Makefile.mk @@ -7,10 +7,10 @@ # # ********************************************************************** -$(test)_programs = publisher subscriber -$(test)_dependencies = IceStorm Ice TestCommon +$(test)_programs = publisher subscriber +$(test)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Single.ice -$(test)_subscriber_sources = Subscriber.cpp Single.ice +$(test)_publisher_sources = Publisher.cpp Single.ice +$(test)_subscriber_sources = Subscriber.cpp Single.ice tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceStorm/stress/Makefile.mk b/cpp/test/IceStorm/stress/Makefile.mk index 4156b782084..f254df233f1 100644 --- a/cpp/test/IceStorm/stress/Makefile.mk +++ b/cpp/test/IceStorm/stress/Makefile.mk @@ -7,10 +7,10 @@ # # ********************************************************************** -$(test)_programs = publisher subscriber -$(test)_dependencies = IceStorm Ice TestCommon +$(test)_programs = publisher subscriber +$(test)_dependencies = IceStorm Ice TestCommon -$(test)_publisher_sources = Publisher.cpp Event.ice -$(test)_subscriber_sources = Subscriber.cpp Event.ice +$(test)_publisher_sources = Publisher.cpp Event.ice +$(test)_subscriber_sources = Subscriber.cpp Event.ice tests += $(test)
\ No newline at end of file diff --git a/cpp/test/ios/controller/Makefile.mk b/cpp/test/ios/controller/Makefile.mk index 061f8a6b099..21d71171f64 100644 --- a/cpp/test/ios/controller/Makefile.mk +++ b/cpp/test/ios/controller/Makefile.mk @@ -7,13 +7,13 @@ # # ********************************************************************** -$(project)_type = xcode -$(project)_platforms = iphonesimulator iphoneos -$(project)_configs = xcodesdk cpp11-xcodesdk -$(project)_dependencies = $(tests) -$(project)_project = C++ Test Controller.xcodeproj -$(project)_scheme = $(if $(filter cpp11-xcodesdk,$2),C++11 Test Controller,C++98 Test Controller) -$(project)_configuration = $(if $(filter $(OPTIMIZE),yes),Release,Debug) +$(project)_type = xcode +$(project)_platforms = iphonesimulator iphoneos +$(project)_configs = xcodesdk cpp11-xcodesdk +$(project)_dependencies = $(tests) +$(project)_project = C++ Test Controller.xcodeproj +$(project)_scheme = $(if $(filter cpp11-xcodesdk,$2),C++11 Test Controller,C++98 Test Controller) +$(project)_configuration = $(if $(filter $(OPTIMIZE),yes),Release,Debug) projects += $(project) tests:: $(project) diff --git a/objective-c/Makefile b/objective-c/Makefile index bbfb2d51555..83e33f09ae3 100644 --- a/objective-c/Makefile +++ b/objective-c/Makefile @@ -7,8 +7,8 @@ # # ********************************************************************** -top_srcdir := .. -lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))) +top_srcdir := .. +lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))) include $(top_srcdir)/config/Make.rules include $(lang_srcdir)/config/Make.rules diff --git a/objective-c/config/Make.rules b/objective-c/config/Make.rules index ba76d2900ca..efe4ddd6ea1 100644 --- a/objective-c/config/Make.rules +++ b/objective-c/config/Make.rules @@ -14,10 +14,10 @@ # # Objective-C mapping configurations # -supported-configs = shared static arc-shared arc-static +supported-configs = shared static arc-shared arc-static ifeq ($(os),Darwin) -include $(lang_srcdir)/config/Make.xcodesdk.rules +include $(lang_srcdir)/config/Make.xcodesdk.rules endif ifneq ($(filter arc-%,$(CONFIGS)),) @@ -28,14 +28,14 @@ endif # # Build only few components with the static configuration (libraries) # -static_components = Ice IceSSL IceObjC IceSSLObjC Glacier2ObjC IceStormObjC IceGridObjC -static_projects = test/% -static_ldflags += $(if $(filter program,$($1_target)),-ObjC) +static_components = Ice IceSSL IceObjC IceSSLObjC Glacier2ObjC IceStormObjC IceGridObjC +static_projects = test/% +static_ldflags += $(if $(filter program,$($1_target)),-ObjC) # # Build only the tests with the ARC configuration # -arc_projects = test/Slice/% test/Ice/% +arc_projects = test/Slice/% test/Ice/% # # Define the arc configuration to build the tests with ARC support. @@ -46,14 +46,14 @@ arc_projects = test/Slice/% test/Ice/% # Ice[osx-shared] not Ice[osx-arc-shared]). This is necessary since # we don't have an ARC specific build of the libraries. # -arc_cppflags := -fobjc-arc -fobjc-arc-exceptions -arc_dependency := +arc_cppflags := -fobjc-arc -fobjc-arc-exceptions +arc_dependency := # # Define slice2objc target extension since it can't be figured out # automatically from the slice2objc translator name. # -slice2objc_targetext = m +slice2objc_targetext = m # Rule for installing headers file from include/objc directory ifeq ($(filter all obj%c,$(ICE_BIN_DIST)),) @@ -69,10 +69,10 @@ endif # define make-objc-src-project ifeq ($(filter all obj%c,$(ICE_BIN_DIST)),) -$1_slicecompiler := slice2objc -$1_sliceflags += -I$(slicedir) -$1_cppflags += -I$(includedir) -I$(includedir)/generated -$1_ldflags += -framework Foundation +$1_slicecompiler := slice2objc +$1_sliceflags += -I$(slicedir) +$1_cppflags += -I$(includedir) -I$(includedir)/generated +$1_ldflags += -framework Foundation $(make-project) srcs:: $1 endif @@ -82,12 +82,12 @@ endef # $(make-objc-test-project $1=project) # define make-objc-test-project -$1_slicecompiler := slice2objc -$1_sliceflags := -I$(slicedir) $$($1_sliceflags) -$1_cppflags := -I$(includedir) -Itest/include -I$1 -I$1/generated $$($1_cppflags) -$1_ldflags += -framework Foundation +$1_slicecompiler := slice2objc +$1_sliceflags := -I$(slicedir) $$($1_sliceflags) +$1_cppflags := -I$(includedir) -Itest/include -I$1 -I$1/generated $$($1_cppflags) +$1_ldflags += -framework Foundation ifeq ($(filter all obj%c,$(ICE_BIN_DIST)),) -$1_cppflags += -I$(includedir)/generated +$1_cppflags += -I$(includedir)/generated endif $(make-project) tests:: $1 @@ -97,12 +97,12 @@ endef # $(create-objc-test-project $1=test) # define create-objc-test-project -$1_srcext := m -$1_dependencies := $$(or $$($1_dependencies),TestCommonObjC IceObjC) -$1_cppflags += -Itest/Ice +$1_srcext := m +$1_dependencies := $$(or $$($1_dependencies),TestCommonObjC IceObjC) +$1_cppflags += -Itest/Ice # Also link with IceSSL when compiling the project with the static configuration -$1[static]_dependencies := IceSSL +$1[static]_dependencies := IceSSL # Dependencies for Xcode SDK configuration $1[xcodesdk]_dependencies := IceSSL diff --git a/objective-c/config/Make.xcodesdk.rules b/objective-c/config/Make.xcodesdk.rules index fd759f4c29e..a7f6e927647 100644 --- a/objective-c/config/Make.xcodesdk.rules +++ b/objective-c/config/Make.xcodesdk.rules @@ -9,19 +9,19 @@ include $(top_srcdir)/config/Make.xcodesdk.rules -supported-configs += xcodesdk arc-xcodesdk +supported-configs += xcodesdk arc-xcodesdk # # Xcode configuration to build Xcode IceSDK. # -xcodesdk_targetdir = $(if $(filter %/build,$5),xcodesdk,IceSDK/$2.sdk/usr/lib) -xcodesdk_installdir = $(if $(filter %/build,$5),xcodesdk,IceSDK/$2.sdk/usr/lib) -xcodesdk_targetrule = $(if $(filter-out program,$($1_target)),static) +xcodesdk_targetdir = $(if $(filter %/build,$5),xcodesdk,IceSDK/$2.sdk/usr/lib) +xcodesdk_installdir = $(if $(filter %/build,$5),xcodesdk,IceSDK/$2.sdk/usr/lib) +xcodesdk_targetrule = $(if $(filter-out program,$($1_target)),static) -xcodesdk_components = Ice IceSSL IceObjC IceSSLObjC Glacier2ObjC IceStormObjC IceGridObjC TestCommonObjC -xcodesdk_projects = test/Ice/% +xcodesdk_components = Ice IceSSL IceObjC IceSSLObjC Glacier2ObjC IceStormObjC IceGridObjC TestCommonObjC +xcodesdk_projects = test/Ice/% -iphoneos_excludes = test/% +iphoneos_excludes = test/% iphonesimulator_excludes = test/% ifneq ($(findstring xcodesdk,$(configs)),) diff --git a/objective-c/src/Glacier2/Makefile.mk b/objective-c/src/Glacier2/Makefile.mk index aefebcfaef7..b349080fbd2 100644 --- a/objective-c/src/Glacier2/Makefile.mk +++ b/objective-c/src/Glacier2/Makefile.mk @@ -7,13 +7,13 @@ # # ********************************************************************** -$(project)_libraries = Glacier2ObjC +$(project)_libraries = Glacier2ObjC -Glacier2ObjC_targetdir := $(libdir) -Glacier2ObjC_sliceflags := --include-dir objc/Glacier2 -Glacier2ObjC_dependencies := IceObjC -Glacier2ObjC_slicedir := $(slicedir)/Glacier2 -Glacier2ObjC_includedir := $(includedir)/objc/Glacier2 +Glacier2ObjC_targetdir := $(libdir) +Glacier2ObjC_sliceflags := --include-dir objc/Glacier2 +Glacier2ObjC_dependencies := IceObjC +Glacier2ObjC_slicedir := $(slicedir)/Glacier2 +Glacier2ObjC_includedir := $(includedir)/objc/Glacier2 Glacier2ObjC_install:: $(install_includedir)/objc/Glacier2.h diff --git a/objective-c/src/Ice/Makefile.mk b/objective-c/src/Ice/Makefile.mk index 90afd254899..ca919e7bd4d 100644 --- a/objective-c/src/Ice/Makefile.mk +++ b/objective-c/src/Ice/Makefile.mk @@ -7,18 +7,18 @@ # # ********************************************************************** -$(project)_libraries = IceObjC +$(project)_libraries = IceObjC -IceObjC_targetdir := $(libdir) -IceObjC_cppflags := -DICE_API_EXPORTS -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated -IceObjC_sliceflags := --include-dir objc/Ice -IceObjC_dependencies := Ice -IceObjC_slicedir := $(slicedir)/Ice -IceObjC_includedir := $(includedir)/objc/Ice -IceObjC_excludes := $(slicedir)/Ice/ValueFactory.ice \ - $(slicedir)/Ice/ObjectFactory.ice \ - $(slicedir)/Ice/Instrumentation.ice \ - $(slicedir)/Ice/Plugin.ice +IceObjC_targetdir := $(libdir) +IceObjC_cppflags := -DICE_API_EXPORTS -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated +IceObjC_sliceflags := --include-dir objc/Ice +IceObjC_dependencies := Ice +IceObjC_slicedir := $(slicedir)/Ice +IceObjC_includedir := $(includedir)/objc/Ice +IceObjC_excludes := $(slicedir)/Ice/ValueFactory.ice \ + $(slicedir)/Ice/ObjectFactory.ice \ + $(slicedir)/Ice/Instrumentation.ice \ + $(slicedir)/Ice/Plugin.ice IceObjC_install:: $(install_includedir)/objc/Ice.h diff --git a/objective-c/src/IceGrid/Makefile.mk b/objective-c/src/IceGrid/Makefile.mk index a3fb1638666..6adc2f6855b 100644 --- a/objective-c/src/IceGrid/Makefile.mk +++ b/objective-c/src/IceGrid/Makefile.mk @@ -7,13 +7,13 @@ # # ********************************************************************** -$(project)_libraries = IceGridObjC +$(project)_libraries = IceGridObjC -IceGridObjC_targetdir := $(libdir) -IceGridObjC_sliceflags := --include-dir objc/IceGrid -IceGridObjC_dependencies := IceObjC Glacier2ObjC -IceGridObjC_slicedir := $(slicedir)/IceGrid -IceGridObjC_includedir := $(includedir)/objc/IceGrid +IceGridObjC_targetdir := $(libdir) +IceGridObjC_sliceflags := --include-dir objc/IceGrid +IceGridObjC_dependencies := IceObjC Glacier2ObjC +IceGridObjC_slicedir := $(slicedir)/IceGrid +IceGridObjC_includedir := $(includedir)/objc/IceGrid IceGridObjC_install:: $(install_includedir)/objc/IceGrid.h diff --git a/objective-c/src/IceSSL/Makefile.mk b/objective-c/src/IceSSL/Makefile.mk index f5f906ce2ec..803740c4f1b 100644 --- a/objective-c/src/IceSSL/Makefile.mk +++ b/objective-c/src/IceSSL/Makefile.mk @@ -7,14 +7,14 @@ # # ********************************************************************** -$(project)_libraries = IceSSLObjC +$(project)_libraries = IceSSLObjC -IceSSLObjC_targetdir := $(libdir) -IceSSLObjC_cppflags := -DICESSL_API_EXPORTS -Isrc/Ice -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated -IceSSLObjC_sliceflags := --include-dir objc/IceSSL -IceSSLObjC_dependencies := IceObjC IceSSL Ice -IceSSLObjC_slicedir := $(slicedir)/IceSSL -IceSSLObjC_includedir := $(includedir)/objc/IceSSL +IceSSLObjC_targetdir := $(libdir) +IceSSLObjC_cppflags := -DICESSL_API_EXPORTS -Isrc/Ice -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated +IceSSLObjC_sliceflags := --include-dir objc/IceSSL +IceSSLObjC_dependencies := IceObjC IceSSL Ice +IceSSLObjC_slicedir := $(slicedir)/IceSSL +IceSSLObjC_includedir := $(includedir)/objc/IceSSL IceSSLObjC_install:: $(install_includedir)/objc/IceSSL.h diff --git a/objective-c/src/IceStorm/Makefile.mk b/objective-c/src/IceStorm/Makefile.mk index 4418e15851c..b2354122433 100644 --- a/objective-c/src/IceStorm/Makefile.mk +++ b/objective-c/src/IceStorm/Makefile.mk @@ -7,13 +7,13 @@ # # ********************************************************************** -$(project)_libraries = IceStormObjC +$(project)_libraries = IceStormObjC -IceStormObjC_targetdir := $(libdir) -IceStormObjC_sliceflags := --include-dir objc/IceStorm -IceStormObjC_dependencies := IceObjC -IceStormObjC_slicedir := $(slicedir)/IceStorm -IceStormObjC_includedir := $(includedir)/objc/IceStorm +IceStormObjC_targetdir := $(libdir) +IceStormObjC_sliceflags := --include-dir objc/IceStorm +IceStormObjC_dependencies := IceObjC +IceStormObjC_slicedir := $(slicedir)/IceStorm +IceStormObjC_includedir := $(includedir)/objc/IceStorm IceStormObjC_install:: $(install_includedir)/objc/IceStorm.h diff --git a/objective-c/test/Common/Makefile.mk b/objective-c/test/Common/Makefile.mk index 053e9e56f86..bee95c57b9d 100644 --- a/objective-c/test/Common/Makefile.mk +++ b/objective-c/test/Common/Makefile.mk @@ -7,15 +7,15 @@ # # ********************************************************************** -$(project)_libraries = TestCommonObjC -$(project)_noinstall = 1 +$(project)_libraries = TestCommonObjC +$(project)_noinstall = 1 # # Put the shared TestCommon library in the lib directory for convenience on platforms # which don't support something like @loader_path. # -TestCommonObjC[shared]_targetdir := lib -TestCommonObjC_dependencies := IceObjC -TestCommonObjC_cppflags := -DTEST_API_EXPORTS -I$(includedir) -Itest/include +TestCommonObjC[shared]_targetdir := lib +TestCommonObjC_dependencies := IceObjC +TestCommonObjC_cppflags := -DTEST_API_EXPORTS -I$(includedir) -Itest/include projects += $(project) diff --git a/objective-c/test/Ice/admin/Makefile.mk b/objective-c/test/Ice/admin/Makefile.mk index 3f435765680..e0629545f26 100644 --- a/objective-c/test/Ice/admin/Makefile.mk +++ b/objective-c/test/Ice/admin/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_client_sources = $(test-client-sources) TestI.m +$(test)_client_sources = $(test-client-sources) TestI.m tests += $(test) diff --git a/objective-c/test/Ice/defaultServant/Makefile.mk b/objective-c/test/Ice/defaultServant/Makefile.mk index af36c0072e8..4eb969d67b0 100644 --- a/objective-c/test/Ice/defaultServant/Makefile.mk +++ b/objective-c/test/Ice/defaultServant/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_client_sources = DefaultServantTest.ice Client.m TestI.m +$(test)_client_sources = DefaultServantTest.ice Client.m TestI.m tests += $(test) diff --git a/objective-c/test/Ice/interceptor/Makefile.mk b/objective-c/test/Ice/interceptor/Makefile.mk index 3058ec13028..0fcb48d4b49 100644 --- a/objective-c/test/Ice/interceptor/Makefile.mk +++ b/objective-c/test/Ice/interceptor/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_client_sources = InterceptorTest.ice Client.m InterceptorI.m MyObjectI.m +$(test)_client_sources = InterceptorTest.ice Client.m InterceptorI.m MyObjectI.m tests += $(test) diff --git a/objective-c/test/Ice/invoke/Makefile.mk b/objective-c/test/Ice/invoke/Makefile.mk index 4fe345612e9..2c95f188c1c 100644 --- a/objective-c/test/Ice/invoke/Makefile.mk +++ b/objective-c/test/Ice/invoke/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_server_sources = InvokeTest.ice Server.m BlobjectI.m +$(test)_server_sources = InvokeTest.ice Server.m BlobjectI.m tests += $(test) diff --git a/objective-c/test/Ice/location/Makefile.mk b/objective-c/test/Ice/location/Makefile.mk index 4e2a0fbd963..cd2d14888ed 100644 --- a/objective-c/test/Ice/location/Makefile.mk +++ b/objective-c/test/Ice/location/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_server_sources = LocationTest.ice ServerLocator.m Server.m TestI.m +$(test)_server_sources = LocationTest.ice ServerLocator.m Server.m TestI.m tests += $(test) diff --git a/objective-c/test/Ice/operations/Makefile.mk b/objective-c/test/Ice/operations/Makefile.mk index 0834fab5f16..03f0dce5284 100644 --- a/objective-c/test/Ice/operations/Makefile.mk +++ b/objective-c/test/Ice/operations/Makefile.mk @@ -7,12 +7,12 @@ # # ********************************************************************** -$(test)_client_sources = $(test-client-sources) \ - Twoways.m \ - TwowaysNewAMI.m \ - Oneways.m \ - OnewaysNewAMI.m \ - BatchOneways.m \ - BatchOnewaysAMI.m +$(test)_client_sources = $(test-client-sources) \ + Twoways.m \ + TwowaysNewAMI.m \ + Oneways.m \ + OnewaysNewAMI.m \ + BatchOneways.m \ + BatchOnewaysAMI.m tests += $(test) diff --git a/objective-c/test/Ice/servantLocator/Makefile.mk b/objective-c/test/Ice/servantLocator/Makefile.mk index 92e1b7341a1..d7ac35282f4 100644 --- a/objective-c/test/Ice/servantLocator/Makefile.mk +++ b/objective-c/test/Ice/servantLocator/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_server_sources = $(test-server-sources) ServantLocatorI.m +$(test)_server_sources = $(test-server-sources) ServantLocatorI.m tests += $(test) diff --git a/objective-c/test/Ice/services/Makefile.mk b/objective-c/test/Ice/services/Makefile.mk index adbdaba19ab..6a5a9fa4cdf 100644 --- a/objective-c/test/Ice/services/Makefile.mk +++ b/objective-c/test/Ice/services/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_dependencies = IceObjC IceGridObjC Glacier2ObjC IceStormObjC TestCommonObjC +$(test)_dependencies = IceObjC IceGridObjC Glacier2ObjC IceStormObjC TestCommonObjC tests += $(test) diff --git a/objective-c/test/Ice/slicing/exceptions/Makefile.mk b/objective-c/test/Ice/slicing/exceptions/Makefile.mk index 3567513d254..3c89fa24cf5 100644 --- a/objective-c/test/Ice/slicing/exceptions/Makefile.mk +++ b/objective-c/test/Ice/slicing/exceptions/Makefile.mk @@ -7,7 +7,7 @@ # # ********************************************************************** -$(test)_client_sources = Client.m AllTests.m SlicingExceptionsTestClient.ice -$(test)_server_sources = Server.m TestI.m SlicingExceptionsTestServer.ice +$(test)_client_sources = Client.m AllTests.m SlicingExceptionsTestClient.ice +$(test)_server_sources = Server.m TestI.m SlicingExceptionsTestServer.ice tests += $(test) diff --git a/objective-c/test/Ice/slicing/objects/Makefile.mk b/objective-c/test/Ice/slicing/objects/Makefile.mk index 5db8a67cb8f..59fbe0c2192 100644 --- a/objective-c/test/Ice/slicing/objects/Makefile.mk +++ b/objective-c/test/Ice/slicing/objects/Makefile.mk @@ -7,7 +7,7 @@ # # ********************************************************************** -$(test)_client_sources = Client.m AllTests.m SlicingObjectsTestClient.ice SlicingObjectsForwardClient.ice -$(test)_server_sources = Server.m TestI.m SlicingObjectsTestServer.ice SlicingObjectsForwardServer.ice +$(test)_client_sources = Client.m AllTests.m SlicingObjectsTestClient.ice SlicingObjectsForwardClient.ice +$(test)_server_sources = Server.m TestI.m SlicingObjectsTestServer.ice SlicingObjectsForwardServer.ice tests += $(test) diff --git a/objective-c/test/Slice/escape/Makefile.mk b/objective-c/test/Slice/escape/Makefile.mk index 172ffdd0d12..6710d6de10a 100644 --- a/objective-c/test/Slice/escape/Makefile.mk +++ b/objective-c/test/Slice/escape/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_client_sources = Client.m Clash.ice Key.ice Inherit.ice +$(test)_client_sources = Client.m Clash.ice Key.ice Inherit.ice tests += $(test) diff --git a/objective-c/test/ios/controller/Makefile.mk b/objective-c/test/ios/controller/Makefile.mk index 61cda72c27f..2ff5750d33d 100644 --- a/objective-c/test/ios/controller/Makefile.mk +++ b/objective-c/test/ios/controller/Makefile.mk @@ -7,14 +7,14 @@ # # ********************************************************************** -$(project)_type = xcode -$(project)_platforms = iphonesimulator iphoneos -$(project)_configs = xcodesdk arc-xcodesdk -$(project)_dependencies = $(if $(ICE_BIN_DIST),,IceObjC IceSSLObjC IceGridObjC Glacier2ObjC IceStormObjC) -$(project)_project = Objective-C Test Controller.xcodeproj -$(project)_scheme = $(if $(filter arc-xcodesdk,$2),Objective-C ARC Test Controller,Objective-C Test Controller) +$(project)_type = xcode +$(project)_platforms = iphonesimulator iphoneos +$(project)_configs = xcodesdk arc-xcodesdk +$(project)_dependencies = $(if $(ICE_BIN_DIST),,IceObjC IceSSLObjC IceGridObjC Glacier2ObjC IceStormObjC) +$(project)_project = Objective-C Test Controller.xcodeproj +$(project)_scheme = $(if $(filter arc-xcodesdk,$2),Objective-C ARC Test Controller,Objective-C Test Controller) # Always build debug configuration to prevent symbols from being stripped -$(project)_configuration = Debug +$(project)_configuration = Debug projects += $(project) tests:: $(project) diff --git a/php/Makefile b/php/Makefile index 67ad6e97bdf..bd378cb03f6 100644 --- a/php/Makefile +++ b/php/Makefile @@ -7,8 +7,8 @@ # # ********************************************************************** -top_srcdir := .. -lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))) +top_srcdir := .. +lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))) include $(top_srcdir)/config/Make.rules diff --git a/php/config/Make.rules b/php/config/Make.rules index 8d8412c35fd..58151d746ee 100644 --- a/php/config/Make.rules +++ b/php/config/Make.rules @@ -55,17 +55,17 @@ $(firstword $(supported-platforms))_installdir[IcePHP] := # # PHP installation directory # -install_phpdir ?= $(if $(usr_dir_install),$(prefix)/share/php,$(prefix)/php) -install_phplibdir ?= $(if $(usr_dir_install),$(shell $(PHP_CONFIG) --extension-dir),$(prefix)/php) +install_phpdir ?= $(if $(usr_dir_install),$(prefix)/share/php,$(prefix)/php) +install_phplibdir ?= $(if $(usr_dir_install),$(shell $(PHP_CONFIG) --extension-dir),$(prefix)/php) # # Rules to build a php module. We just compute the name of the php module # and delegate to make-shared-module. # -mkphpmodulename ?= $(patsubst lib%,%,$(call mkshlibname,$(1))) -make-shared-php-module = $(call make-shared-module,$(call mkphpmodulename,$1),$2,$3,$4,$5,$6,$7,$8,$9) -get-shared-php-module-targets = $(call get-shared-module-targets,$(call mkphpmodulename,$1),$2,$3,$4) -install-shared-php-module = $(call install-shared-module,$(call mkphpmodulename,$1),$2,$3,$4,$5) +mkphpmodulename ?= $(patsubst lib%,%,$(call mkshlibname,$(1))) +make-shared-php-module = $(call make-shared-module,$(call mkphpmodulename,$1),$2,$3,$4,$5,$6,$7,$8,$9) +get-shared-php-module-targets = $(call get-shared-module-targets,$(call mkphpmodulename,$1),$2,$3,$4) +install-shared-php-module = $(call install-shared-module,$(call mkphpmodulename,$1),$2,$3,$4,$5) $(DESTDIR)$(install_phpdir): $(Q)$(MKDIR) -p $@ diff --git a/php/src/php5/Makefile.mk b/php/src/php5/Makefile.mk index ae64affeb94..aa1ecea31ba 100644 --- a/php/src/php5/Makefile.mk +++ b/php/src/php5/Makefile.mk @@ -9,13 +9,13 @@ $(project)_libraries := IcePHP -IcePHP_target := php-module -IcePHP_targetname := IcePHP -IcePHP_targetdir := lib -IcePHP_installdir := $(install_phplibdir) -IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/src $(php_cpp_includes) $(php_cppflags) -IcePHP_ldflags := $(php_ldflags) -IcePHP_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice +IcePHP_target := php-module +IcePHP_targetname := IcePHP +IcePHP_targetdir := lib +IcePHP_installdir := $(install_phplibdir) +IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/src $(php_cpp_includes) $(php_cppflags) +IcePHP_ldflags := $(php_ldflags) +IcePHP_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice IcePHP_extra_sources := $(top_srcdir)/cpp/src/Slice/PHPUtil.cpp projects += $(project) diff --git a/php/src/php7/Makefile.mk b/php/src/php7/Makefile.mk index ae64affeb94..aa1ecea31ba 100644 --- a/php/src/php7/Makefile.mk +++ b/php/src/php7/Makefile.mk @@ -9,13 +9,13 @@ $(project)_libraries := IcePHP -IcePHP_target := php-module -IcePHP_targetname := IcePHP -IcePHP_targetdir := lib -IcePHP_installdir := $(install_phplibdir) -IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/src $(php_cpp_includes) $(php_cppflags) -IcePHP_ldflags := $(php_ldflags) -IcePHP_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice +IcePHP_target := php-module +IcePHP_targetname := IcePHP +IcePHP_targetdir := lib +IcePHP_installdir := $(install_phplibdir) +IcePHP_cppflags := -I$(project) -I$(top_srcdir)/cpp/src $(php_cpp_includes) $(php_cppflags) +IcePHP_ldflags := $(php_ldflags) +IcePHP_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice IcePHP_extra_sources := $(top_srcdir)/cpp/src/Slice/PHPUtil.cpp projects += $(project) diff --git a/python/Makefile b/python/Makefile index 3a6c1fd4074..8d4cc32f323 100644 --- a/python/Makefile +++ b/python/Makefile @@ -7,8 +7,8 @@ # # ********************************************************************** -top_srcdir := .. -lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))) +top_srcdir := .. +lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))) ifeq ($(PYTHON),) PYTHON = python diff --git a/python/config/Make.rules b/python/config/Make.rules index 5b90eb142d2..549a0d6f2cc 100644 --- a/python/config/Make.rules +++ b/python/config/Make.rules @@ -20,17 +20,17 @@ PYTHON ?= python -include $(lang_srcdir)/config/Make.rules.$(os) -python-call = $(shell $(PYTHON) -c "import sys; import distutils.sysconfig as ds; sys.stdout.write($1)") +python-call = $(shell $(PYTHON) -c "import sys; import distutils.sysconfig as ds; sys.stdout.write($1)") -PYTHON_VERSION ?= python$(PYTHON_BASE_VERSION) -PYTHON_BASE_VERSION ?= $(call python-call,ds.get_python_version()) -PYTHON_INCLUDE_DIR ?= $(call python-call,ds.get_python_inc()) -PYTHON_LIB_DIR ?= $(call python-call,ds.get_config_var('LIBPL')) -PYTHON_LIB_SUFFIX ?= $(call python-call,sys.__dict__['abiflags'] if 'abiflags' in sys.__dict__ else '') -PYTHON_LIB_NAME ?= $(PYTHON_VERSION)$(PYTHON_LIB_SUFFIX) +PYTHON_VERSION ?= python$(PYTHON_BASE_VERSION) +PYTHON_BASE_VERSION ?= $(call python-call,ds.get_python_version()) +PYTHON_INCLUDE_DIR ?= $(call python-call,ds.get_python_inc()) +PYTHON_LIB_DIR ?= $(call python-call,ds.get_config_var('LIBPL')) +PYTHON_LIB_SUFFIX ?= $(call python-call,sys.__dict__['abiflags'] if 'abiflags' in sys.__dict__ else '') +PYTHON_LIB_NAME ?= $(PYTHON_VERSION)$(PYTHON_LIB_SUFFIX) -python_cppflags := -I$(PYTHON_INCLUDE_DIR) -python_ldflags := -L$(PYTHON_LIB_DIR) -l$(PYTHON_LIB_NAME) +python_cppflags := -I$(PYTHON_INCLUDE_DIR) +python_ldflags := -L$(PYTHON_LIB_DIR) -l$(PYTHON_LIB_NAME) # # Python installation directory @@ -41,10 +41,10 @@ install_pythondir = $(if $(usr_dir_install),$(shell $(PYTHON) $(lang_srcdir)/co # Rules to build a python module. We just compute the name of the python module # and delegate to make-shared-module. # -mkpymodulename ?= $(patsubst lib%,%,$(call mkshlibname,$(1))) -make-shared-python-module = $(call make-shared-module,$(call mkpymodulename,$1),$2,$3,$4,$5,$6,$7,$8,$9) +mkpymodulename ?= $(patsubst lib%,%,$(call mkshlibname,$(1))) +make-shared-python-module = $(call make-shared-module,$(call mkpymodulename,$1),$2,$3,$4,$5,$6,$7,$8,$9) get-shared-python-module-targets = $(call get-shared-module-targets,$(call mkpymodulename,$1),$2,$3,$4) -install-shared-python-module = $(call install-shared-module,$(call mkpymodulename,$1),$2,$3,$4,$5) +install-shared-python-module = $(call install-shared-module,$(call mkpymodulename,$1),$2,$3,$4,$5) $(DESTDIR)$(install_pythondir): $(Q)$(MKDIR) -p $@ diff --git a/python/modules/IcePy/Makefile.mk b/python/modules/IcePy/Makefile.mk index 9f603b9ae23..e18d0c3d243 100644 --- a/python/modules/IcePy/Makefile.mk +++ b/python/modules/IcePy/Makefile.mk @@ -9,19 +9,19 @@ $(project)_libraries := IcePy -IcePy_target := python-module -IcePy_targetname := IcePy -IcePy_targetdir := $(lang_srcdir)/python -IcePy_installdir := $(install_pythondir) -IcePy_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated \ +IcePy_target := python-module +IcePy_targetname := IcePy +IcePy_targetdir := $(lang_srcdir)/python +IcePy_installdir := $(install_pythondir) +IcePy_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated \ -I$(top_srcdir)/cpp/src $(python_cppflags) -IcePy_ldflags := $(python_ldflags) -IcePy_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice +IcePy_ldflags := $(python_ldflags) +IcePy_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice IcePy_libs := mcpp IcePy_extra_sources := $(filter-out %Util.cpp %Ruby.cpp,\ - $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp)) \ - $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \ - $(top_srcdir)/cpp/src/Slice/PythonUtil.cpp \ + $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp)) \ + $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \ + $(top_srcdir)/cpp/src/Slice/PythonUtil.cpp \ $(top_srcdir)/cpp/src/Slice/StringLiteralUtil.cpp \ # diff --git a/python/python/Makefile b/python/python/Makefile index d4969970981..53346ffef2f 100644 --- a/python/python/Makefile +++ b/python/python/Makefile @@ -7,8 +7,8 @@ # # ********************************************************************** -top_srcdir := ../.. -lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))))) +top_srcdir := ../.. +lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))))) include $(top_srcdir)/config/Make.rules include $(lang_srcdir)/config/Make.rules diff --git a/ruby/Makefile b/ruby/Makefile index f04aa2690ca..61c22386252 100644 --- a/ruby/Makefile +++ b/ruby/Makefile @@ -7,8 +7,8 @@ # # ********************************************************************** -top_srcdir := .. -lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))) +top_srcdir := .. +lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))) ifeq ($(filter all ruby,$(ICE_BIN_DIST)),) diff --git a/ruby/config/Make.rules b/ruby/config/Make.rules index b5f23f6efb0..27a9949aab6 100644 --- a/ruby/config/Make.rules +++ b/ruby/config/Make.rules @@ -19,9 +19,9 @@ RUBY ?= ruby ruby-call = $(shell $(RUBY) -e 'require "rbconfig"; puts RbConfig::expand("$1")') # Ruby compiler flags -ruby_cppflags := -I$(call ruby-call,$$(rubyhdrdir)) +ruby_cppflags := -I$(call ruby-call,$$(rubyhdrdir)) ruby_config_dir := $(call ruby-call,$$(includedir)/$$(arch)/ruby-$$(ruby_version)) -ruby_arch := $(call ruby-call,$$(arch)) +ruby_arch := $(call ruby-call,$$(arch)) ifeq ($(wildcard $(ruby_config_dir)/ruby/config.h),) ruby_config_dir := $(call ruby-call,$$(rubyhdrdir)/$$(arch)) endif @@ -40,8 +40,8 @@ ifeq ($(shell uname),Darwin) endif # Ruby linker flags -ruby_ldflags := $(call ruby-call,$$(LIBRUBYARG)) -ruby_libdir := $(call ruby-call,$(if $(findstring MINGW,$(shell uname)),$$(bindir),$$(libdir))) +ruby_ldflags := $(call ruby-call,$$(LIBRUBYARG)) +ruby_libdir := $(call ruby-call,$(if $(findstring MINGW,$(shell uname)),$$(bindir),$$(libdir))) ifneq ($(ruby_libdir),) ruby_ldflags := -L$(call ruby-call,$$(libdir)) $(ruby_ldflags) endif @@ -49,17 +49,17 @@ endif # # Ruby installation directory # -install_rubydir = $(if $(usr_dir_install),$(ruby_libdir),$(prefix)/ruby) -install_rubylibdir = $(if $(usr_dir_install),$(ruby_libdir)/$(ruby_arch),$(prefix)/ruby) +install_rubydir = $(if $(usr_dir_install),$(ruby_libdir),$(prefix)/ruby) +install_rubylibdir = $(if $(usr_dir_install),$(ruby_libdir)/$(ruby_arch),$(prefix)/ruby) # # Rules to build a ruby module. We just compute the name of the ruby module # and delegate to make-shared-module. # -mkrbmodulename ?= $(patsubst lib%,%,$(call mkshlibname,$(1))) -make-shared-ruby-module = $(call make-shared-module,$(call mkrbmodulename,$1),$2,$3,$4,$5,$6,$7,$8,$9) -get-shared-ruby-module-targets = $(call get-shared-module-targets,$(call mkrbmodulename,$1),$2,$3,$4) -install-shared-ruby-module = $(call install-shared-module,$(call mkrbmodulename,$1),$2,$3,$4,$5) +mkrbmodulename ?= $(patsubst lib%,%,$(call mkshlibname,$(1))) +make-shared-ruby-module = $(call make-shared-module,$(call mkrbmodulename,$1),$2,$3,$4,$5,$6,$7,$8,$9) +get-shared-ruby-module-targets = $(call get-shared-module-targets,$(call mkrbmodulename,$1),$2,$3,$4) +install-shared-ruby-module = $(call install-shared-module,$(call mkrbmodulename,$1),$2,$3,$4,$5) $(DESTDIR)$(install_rubydir): $(Q)$(MKDIR) -p $@ diff --git a/ruby/src/IceRuby/Makefile.mk b/ruby/src/IceRuby/Makefile.mk index 3b251d8017c..b65b6eb06fb 100644 --- a/ruby/src/IceRuby/Makefile.mk +++ b/ruby/src/IceRuby/Makefile.mk @@ -9,19 +9,19 @@ $(project)_libraries := IceRuby -IceRuby_target := ruby-module -IceRuby_targetname := IceRuby -IceRuby_targetdir := $(lang_srcdir)/ruby -IceRuby_installdir := $(install_rubylibdir) -IceRuby_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated \ - -I$(top_srcdir)/cpp/src $(ruby_cppflags) -IceRuby_ldflags := $(ruby_ldflags) -IceRuby_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice +IceRuby_target := ruby-module +IceRuby_targetname := IceRuby +IceRuby_targetdir := $(lang_srcdir)/ruby +IceRuby_installdir := $(install_rubylibdir) +IceRuby_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated \ + -I$(top_srcdir)/cpp/src $(ruby_cppflags) +IceRuby_ldflags := $(ruby_ldflags) +IceRuby_dependencies := IceDiscovery IceLocatorDiscovery IceSSL Ice IceRuby_libs := mcpp IceRuby_extra_sources := $(filter-out %Util.cpp %Python.cpp,\ - $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp)) \ - $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \ - $(top_srcdir)/cpp/src/Slice/RubyUtil.cpp \ + $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp)) \ + $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \ + $(top_srcdir)/cpp/src/Slice/RubyUtil.cpp \ $(top_srcdir)/cpp/src/Slice/StringLiteralUtil.cpp |