Kaydet (Commit) 7bf06ba9 authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen

rename YaccObject to YaccTarget

the object is a GenCxxObject just like those from CustomTargets, we only need to get the generation right
üst 5dc33abf
......@@ -34,7 +34,7 @@ $(eval $(call gb_Executable_set_include,rsc,\
$$(INCLUDE) \
-I$(SRCDIR)/rsc/inc \
-I$(SRCDIR)/rsc/inc/pch \
-I$(WORKDIR)/YaccObject/rsc/source/parser \
-I$(WORKDIR)/YaccTarget/rsc/source/parser \
))
$(eval $(call gb_Executable_add_api,rsc,\
......@@ -58,7 +58,7 @@ $(eval $(call gb_Executable_add_grammars,rsc,\
rsc/source/parser/rscyacc \
))
$(call gb_YaccObject_get_target,rsc/source/parser/rscyacc): T_CXXFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
$(call gb_YaccTarget_get_target,rsc/source/parser/rscyacc): T_CXXFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
$(eval $(call gb_Executable_add_exception_objects,rsc,\
rsc/source/parser/erscerr \
......
......@@ -224,25 +224,25 @@ endif
gb_GenCxxObject_GenCxxObject =
# YaccObject class
gb_YaccObject_get_source = $(1)/$(2).y
# YaccTarget class
gb_YaccTarget_get_source = $(1)/$(2).y
.PHONY : $(call gb_YaccObject_get_clean_target,%)
$(call gb_YaccObject_get_clean_target,%) :
.PHONY : $(call gb_YaccTarget_get_clean_target,%)
$(call gb_YaccTarget_get_clean_target,%) :
$(call gb_Output_announce,$(2),$(false),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_YaccObject_get_header_target,$*) $(call gb_YaccObject_get_target,$*))
rm -f $(call gb_YaccTarget_get_header_target,$*) $(call gb_YaccTarget_get_target,$*))
$(call gb_YaccObject_get_target,%) : $(call gb_YaccObject_get_source,$(SRCDIR),%)
$(call gb_YaccObject__command,$<,$*,$@,$(call gb_YaccObject_get_header_target,$*))
$(call gb_YaccTarget_get_target,%) : $(call gb_YaccTarget_get_source,$(SRCDIR),%)
$(call gb_YaccTarget__command,$<,$*,$@,$(call gb_YaccTarget_get_header_target,$*))
gb_YaccObject_YaccObject =
gb_YaccTarget_YaccTarget =
gb_YACC := bison
# YaccObject class
# YaccTarget class
# defined by platform
# gb_YaccObject__command(grammar-file, stem-for-message, source-target, include-target)
# gb_YaccTarget__command(grammar-file, stem-for-message, source-target, include-target)
# ObjCxxObject class
#
......@@ -852,13 +852,13 @@ endef
# Add a bison grammar to the build.
# gb_LinkTarget_add_grammar(<component>,<grammar file>)
define gb_LinkTarget_add_grammar
$(call gb_LinkTarget_add_generated_cxx_object,$(1),YaccObject/$(2))
$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_YaccObject_get_clean_target,$(2))
$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_YaccObject_get_header_target,$(2)))
$(call gb_LinkTarget_add_generated_cxx_object,$(1),YaccTarget/$(2))
$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_YaccTarget_get_clean_target,$(2))
$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_YaccTarget_get_header_target,$(2)))
endef
#$(call gb_YaccObject_YaccObject,$(2))
#$(call gb_YaccTarget_YaccTarget,$(2))
# Add bison grammars to the build.
# gb_LinkTarget_add_grammars(<component>,<grammar file> [<grammar file>*])
......
......@@ -125,8 +125,8 @@ gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1)
gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
# workdir targets: $(1) is prefix/path
gb_Configuration_get_target = $(WORKDIR)/Configuration/$(1).done
gb_YaccObject_get_header_target = $(WORKDIR)/YaccObject/$(1).hxx
gb_YaccObject_get_target = $(WORKDIR)/YaccObject/$(1).cxx
gb_YaccTarget_get_header_target = $(WORKDIR)/YaccTarget/$(1).hxx
gb_YaccTarget_get_target = $(WORKDIR)/YaccTarget/$(1).cxx
gb_XcsTarget_get_target = $(WORKDIR)/XcsTarget/$(1)
gb_XcuDataTarget_get_target = $(WORKDIR)/XcuDataTarget/$(1)
gb_XcuLangpackTarget_get_target = $(WORKDIR)/XcuLangpackTarget/$(1)
......@@ -176,7 +176,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
ExternalLib \
UnoApiTarget \
WinResTarget \
YaccObject \
YaccTarget \
Zip \
XcsTarget \
XcuDataTarget \
......
......@@ -137,9 +137,9 @@ endef
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
# YaccObject class
# YaccTarget class
define gb_YaccObject__command
define gb_YaccTarget__command
$(call gb_Output_announce,$(2),$(true),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
......
......@@ -167,7 +167,7 @@ endef
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
# YaccObject class
# YaccTarget class
ifeq ($(CPUNAME),POWERPC)
#
......@@ -176,7 +176,7 @@ ifeq ($(CPUNAME),POWERPC)
# the result is that the header is named <foo>.cxx.h instead of <foo>.hxx
# so we queue a mv to rename the header accordingly.
#
define gb_YaccObject__command
define gb_YaccTarget__command
$(call gb_Output_announce,$(2),$(true),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
......@@ -185,7 +185,7 @@ $(call gb_Helper_abbreviate_dirs,\
endef
else
define gb_YaccObject__command
define gb_YaccTarget__command
$(call gb_Output_announce,$(2),$(true),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
......
......@@ -224,9 +224,9 @@ endef
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
# YaccObject class
# YaccTarget class
define gb_YaccObject__command
define gb_YaccTarget__command
$(call gb_Output_announce,$(2),$(true),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
......
......@@ -271,9 +271,9 @@ endef
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
# YaccObject class
# YaccTarget class
define gb_YaccObject__command
define gb_YaccTarget__command
$(call gb_Output_announce,$(2),$(true),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
......
......@@ -170,9 +170,9 @@ endef
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
# YaccObject class
# YaccTarget class
define gb_YaccObject__command
define gb_YaccTarget__command
$(call gb_Output_announce,$(2),$(true),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment