Apache OpenOffice (AOO) Bugzilla – Issue 66531
Lots of "Macro `LAST_MINOR' redefined after use" warnings
Last modified: 2007-01-03 12:12:04 UTC
solenv/inc/minor.mk defines LAST_MINOR and is .INCLUDEed by settings.mk hsqldb\makefile.mk .INCLUDEes minor.mk again. I guess this is a bug. settings.mh also defines a rule to create $(UPD)minor.mk as a copy of minor.mk and $(UPD)minor.mk is .INCLUDEed in: automation/ binfilter/ desktop/ sc/ sw/ Is $(UPD)minor.mk needed? Or can I prepare a patch to remove the generating rule and the .INCLUDES? And what about the: .INCLUDE : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/$(UPD)minor.mk in settings.mk. It comes a few lines after the .INCLUDE : minor.mk Slightly related: Where do we create the $(UPD)$(LAST_MINOR).mk for: .INCLUDE .IGNORE: $(UPD)$(LAST_MINOR).mk ?
Created attachment 37217 [details] Clean up for settings.mk
To answer one of my questions, yes we need to include $(UPD)minor.mk to force the creation of "its" directory and the flag file. Previous patch cleans that section up a little. The first and last part of the second remain unanswered.
Created attachment 37218 [details] Fixed typo in previous patch
> The first and last part of the second remain unanswered. Wow, cryptic! I meant: The first and last part of the initial question remain unanswered.
> hsqldb\makefile.mk .INCLUDEes minor.mk again. I guess this is a bug. yes also $(UPD)minor.mk isn't intended to be included by anyone else but settings.mk. this is wrong too. >Slightly related: Where do we create the $(UPD)$(LAST_MINOR).mk for: >.INCLUDE .IGNORE: $(UPD)$(LAST_MINOR).mk >? hmm... couldn't find neither creation nor usage of this .mk in solenv/inc. it also isn't created in regular builds here. looks obsolete... btw.: you cannot simply remove the .IGNORE attribute from including udkversion.mk as it will break builds from scratch.
> btw.: you cannot simply remove the .IGNORE attribute from including > udkversion.mk as it will break builds from scratch. Uh, right, as $(PRJ)$/inc$/udkversion.mk in: %udkversion.mk : $(PRJ)$/inc$/udkversion.mk @+$(COPY) $(PRJ)$/inc$/udkversion.mk $@ only exists in certain projects. Maybe the .INCLUDE ...udkversion.mk and the rule to create it should move into the projects that need it. (Which are those?) I will prepare a patch for the minor.mk stuff, do you have a CWS with: automation, binfilter, desktop, sc, sw ?
>only exists in certain projects. Maybe the .INCLUDE ...udkversion.mk and >the rule to create it should move into the projects that need it. (Which are >those?) AFAIK, there are several. don't ask me for the names. also, including it doesn't mean there is any usage of it's content ;) >I will prepare a patch for the minor.mk stuff, do you have a CWS with: > automation, binfilter, desktop, sc, sw ? not yet. but i'll create a new one and add these modules (no helpcontent2? ;)).
udkversion.mk lives in sal/inc/ and only sets UDK_{MAJOR,MINOR,MICRO} and these doesn't seem to be used very often: <http://go-oo.org/lxr/ident?i=UDK_MAJOR> That file should move into solenv/inc/ and maybe we then move the .INCLUDE into the projects that need the three macros. - Or set the three variables in *env.set / solarenv (or what it is called) then we don't need the .INCLUDE.
@jsc: are the reasons not to put udkversion.mk into solenv still valid?
Created attachment 37237 [details] Remove unneeded includes of *minor.mk
Created attachment 37305 [details] `LAST_MINOR` only patch
Committed the previous patch to vq33. I will create two new issues for the .SUFFIXES and udkversion.mk issues.
@ause: Please verify.
I found another one in hsqldb/makefile.mk.
Removed/committed to vq33. @ause: Please verify.
lots of $(UPD)minor.mk includes removed
.