diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2019-11-12 10:55:37 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2019-11-12 10:55:37 +0100 |
| commit | b32503bbb867bc28a2d98fcc0816b77bc1d35d83 (patch) | |
| tree | 9feaa9915589a8153a91bc52905d562e273a1a66 | |
| parent | Fix slice2swift build failures (diff) | |
| download | ice-b32503bbb867bc28a2d98fcc0816b77bc1d35d83.tar.bz2 ice-b32503bbb867bc28a2d98fcc0816b77bc1d35d83.tar.xz ice-b32503bbb867bc28a2d98fcc0816b77bc1d35d83.zip | |
Make build system fixes
- fixed invalid ice_slicedir reference for inclduedir computation
- fixed Bison/Flex generation to not delete intermediary generated source files
| -rw-r--r-- | config/Make.project.rules | 9 | ||||
| -rw-r--r-- | config/Make.rules | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/config/Make.project.rules b/config/Make.project.rules index 6da5ed2dbf0..6a5083abba5 100644 --- a/config/Make.project.rules +++ b/config/Make.project.rules @@ -297,8 +297,8 @@ endef 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) +# $(call make-program,$1=exename,$2=bindir,$3=version,$4=soversion,$5=objects,$6=dependencies,$7=ldflags, +# $8=platform,$9=config) # # Defines a rule for building the program <exename> in <bindir> with the objects <objects> # @@ -589,6 +589,11 @@ endif # ifeq ($$($2_sources),) $2_sources := $$(foreach e,$(source-extensions),$$(wildcard $$($2_srcdir)/*.$$(e))) +ifeq ($(BISON_FLEX),yes) +# Make sure the source files generated by bison/flex are dependencies of the target to prevent them from +# being considered as intermediaries by make and being deleted. +$2:: $$(patsubst %.y %.l,%.cpp,$$(wildcard $$($2_srcdir)/*.y) $$(wildcard $$($2_srcdir)/*.l)) +endif ifneq ($$($2_slicedir),) $2_sources += $$(wildcard $$($2_slicedir)/*.ice) endif diff --git a/config/Make.rules b/config/Make.rules index c187a42cbf5..2006adaf576 100644 --- a/config/Make.rules +++ b/config/Make.rules @@ -146,7 +146,7 @@ use-bin-dist = $(or $(filter all,$(ICE_BIN_DIST)),\ bindir = $(if $(use-bin-dist),$(ice_bindir),$(call mappingdir,$(or $1,$(currentdir)),bin)) libdir = $(if $(use-bin-dist),$(ice_libdir),$(call mappingdir,$(or $1,$(currentdir)),lib)) -includedir = $(if $(use-bin-dist),$(ice_slicedir),$(call mappingdir,$(or $1,$(currentdir)),include)) +includedir = $(if $(use-bin-dist),$(ice_includedir),$(call mappingdir,$(or $1,$(currentdir)),include)) slicedir = $(if $(use-bin-dist),$(ice_slicedir),$(top_srcdir)/slice) sdkdir = $(if $(use-bin-dist),$(ice_home)/sdk,$(top_srcdir)/sdk) srcdir = $(call mappingdir,$(or $1,$(currentdir)),src) |