diff options
Diffstat (limited to 'solenv/inc/rules.mk')
-rw-r--r-- | solenv/inc/rules.mk | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 0496b949bf92..4f42fa67a4e4 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -37,16 +37,16 @@ $(OBJ)$/%.obj : %.cxx .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx -.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" -.IF "$(noadjust)"=="" +.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.IF "$(noadjust)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) -.ENDIF # "$(noadjust)"=="" -.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.ENDIF # "$(noadjust)"=="" +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx .ELSE $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx .ENDIF @@ -62,14 +62,14 @@ $(OBJ)$/%.obj : %.cpp .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp -.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) -.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE @@-$(RM) $@ .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp .ELSE $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp .ENDIF @@ -85,14 +85,14 @@ $(OBJ)$/%.obj : %.cc .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cc -.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) -.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE @@$(RM) $@ .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cc + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cc .ELSE $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cc ) .ENDIF @@ -113,7 +113,7 @@ $(SLO)$/precompiled.% .PHONY: .IF "$(NETWORK_BUILD)"!="" -$(MKDIRHIER) $(PCHOUTDIR) .IF "$(HAVE_BIG_TMP)"=="" - -$(COPY) $(SLO)$/pch$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) + -$(COPY) $(SLO)$/pch$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) .ENDIF # "$(HAVE_BIG_TMP)"=="" .ENDIF # "$(NETWORK_BUILD)"!="" $(CXX) @$(mktmp -Fp$(PCHOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)$/precompiled_$(PRJNAME).cxx) @@ -138,7 +138,7 @@ $(SLO)$/precompiled_ex.% .PHONY: .IF "$(NETWORK_BUILD)"!="" -$(MKDIRHIER) $(PCHEXOUTDIR) .IF "$(HAVE_BIG_TMP)"=="" - -$(COPY) $(SLO)$/pch_ex$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) + -$(COPY) $(SLO)$/pch_ex$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) .ENDIF # "$(HAVE_BIG_TMP)"=="" .ENDIF # "$(NETWORK_BUILD)"!="" $(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)$/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)$/precompiled_$(PRJNAME).cxx) @@ -164,8 +164,8 @@ $(SLO)$/precompiled_ex.% .PHONY: $(SLO)$/%.obj : %.cxx @echo ------------------------------ @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$< -.IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" ) -# just a helper var +.IF "$(ENABLE_PCH)"!="" # && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" ) +# just a helper var @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS))) # cleanup first @noop $(assign ACT_PCH_SWITCHES:=$(NULL)) @@ -184,7 +184,7 @@ $(SLO)$/%.obj : %.cxx $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT) .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(CAPTURE_COMMAND)"=="" $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) -.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ENDIF .ELSE # "$(GUI)"=="UNX" @@ -193,7 +193,7 @@ $(SLO)$/%.obj : %.cxx $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT) .ELSE $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx $(CAPTURE_OUTPUT) -.ENDIF # "$(COM)"=="GCC" +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)"=="UNX" .IF "$(nodep)"=="" # fixme: write to file |