diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-01-10 12:02:50 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-01-10 12:02:50 +0000 |
| commit | ba7d8b08c61e0ab1e23483275c4b33fbc43c1650 (patch) | |
| tree | 79305c53d107e6f4b06e312457ac32f3810ae7c2 /solenv | |
| parent | 12506ee0e1d4ad1c7ef312fa80199fae344a5c15 (diff) | |
INTEGRATION: CWS xmlfilter02 (1.65.54); FILE MERGED
2007/12/12 10:11:57 dr 1.65.54.10: RESYNC: (1.90-1.91); FILE MERGED
2007/10/04 11:10:12 os 1.65.54.9: RESYNC: (1.89-1.90); FILE MERGED
2007/07/24 20:48:50 dr 1.65.54.8: RESYNC: (1.87-1.89); FILE MERGED
2007/05/29 12:11:12 dr 1.65.54.7: RESYNC: (1.86-1.87); FILE MERGED
2007/05/08 09:30:38 dr 1.65.54.6: RESYNC: (1.84-1.86); FILE MERGED
2007/03/14 18:25:12 dr 1.65.54.5: RESYNC: (1.80-1.84); FILE MERGED
2007/02/27 12:19:31 dr 1.65.54.4: for gperf
2007/01/19 11:40:14 cl 1.65.54.3: resolved merge conflicts
2007/01/17 21:54:04 cl 1.65.54.2: RESYNC: (1.65-1.80); FILE MERGED
2006/05/03 11:29:34 cl 1.65.54.1: added support for .cc
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/rules.mk | 45 |
1 files changed, 43 insertions, 2 deletions
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 0281a80f0c46..a1ee38b308bc 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -4,9 +4,9 @@ # # $RCSfile: rules.mk,v $ # -# $Revision: 1.92 $ +# $Revision: 1.93 $ # -# last change: $Author: obo $ $Date: 2008-01-04 16:16:14 $ +# last change: $Author: obo $ $Date: 2008-01-10 13:02:50 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -79,6 +79,27 @@ $(OBJ)$/%.obj : %.cpp .ENDIF .ENDIF +$(OBJ)$/%.obj : %.cc + @echo ------------------------------ + @echo Making: $@ +.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)"=="" + $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" + +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) +.ELSE + @+-$(RM) $@ >& $(NULLDEV) + @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cc ) + @+$(ECHONL) +.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 +.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 +.ENDIF + .IF "$(ENABLE_PCH)"!="" $(SLO)$/precompiled.% .PHONY: -$(MKDIRHIER) $(SLO)$/pch @@ -194,6 +215,26 @@ $(SLO)$/%.obj : $(MISC)$/%.cxx .ENDIF .ENDIF +$(SLO)$/%.obj : $(MISC)$/%.cc + @echo ------------------------------ + @echo Making: $@ +.IF "$(GUI)"=="UNX" +.IF "$(TEST)"!="" + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)$/$*.cc +.ELSE + @$(RM) $@ $(@:s/.obj/.o/) + $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(CFLAGSINCXX)$(MISC)$/$*.cc +.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" + $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) +.ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" + +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) +.ENDIF +.ELSE + @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cc ) + @+$(ECHONL) + $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cc ) +.ENDIF + $(OBJ)$/%.obj : $(MISC)$/%.cxx @echo ------------------------------ @echo Making: $@ |