diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 14:49:03 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 14:49:03 +0000 |
| commit | d1911f00cbe834545ef37dc56d0546442f38ed76 (patch) | |
| tree | a833b5fdacdde868b6c4183d58098f3502bac99a /solenv | |
| parent | eb08107cefa7a9ebc1e79de25dad3f4f794163a3 (diff) | |
INTEGRATION: CWS aquavcl04 (1.90.40); FILE MERGED
2007/11/16 06:22:46 pl 1.90.40.3: RESYNC: (1.90-1.91); FILE MERGED
2007/10/15 14:03:39 pl 1.90.40.2: #i82627# changed touch command to resemble c++ case
2007/10/15 13:25:28 pl 1.90.40.1: #i82627# compile objective c++ as c++ not c
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/rules.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index a1ee38b308bc..c858c17868de 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -4,9 +4,9 @@ # # $RCSfile: rules.mk,v $ # -# $Revision: 1.93 $ +# $Revision: 1.94 $ # -# last change: $Author: obo $ $Date: 2008-01-10 13:02:50 $ +# last change: $Author: ihi $ $Date: 2008-01-14 15:49:03 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -408,11 +408,11 @@ $(OBJ)$/%.obj : %.mm @echo Making: $@ .IF "$(OS)"=="MACOSX" .IF "$(TEST)"!="" - $(objc) $(CFLAGS) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm + $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm .ELSE @$(RM) $@ $(@:s/.obj/.o/) - $(objc) $(CFLAGS) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ + $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $*.mm + $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ENDIF .ELSE "$(OS)"=="MACOSX" @echo "No recipe for compiling Objective-C++ files is available for this platform" @@ -424,8 +424,8 @@ $(OBJ)$/%.obj : $(MISC)$/%.mm @echo Making: $@ .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) - $(objc) $(CFLAGS) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.mm - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ + $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(MISC)$/$*.mm + $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE "$(OS)"=="MACOSX" @echo "No recipe for compiling Objective-C++ files is available for this platform" .ENDIF "$(OS)"=="MACOSX" @@ -436,8 +436,8 @@ $(SLO)$/%.obj : $(MISC)$/%.mm @echo Making: $@ .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) - $(objc) $(CFLAGS) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.mm - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ + $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $(MISC)$/$*.mm + $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE "$(OS)"=="MACOSX" @echo "No recipe for compiling Objective-C++ files is available for this platform" .ENDIF "$(OS)"=="MACOSX" @@ -448,8 +448,8 @@ $(SLO)$/%.obj : %.mm @echo Making: $@ .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) - $(objc) $(CFLAGS) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.mm - +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ + $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$*.o $*.mm + $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE "$(OS)"=="MACOSX" @echo "No recipe for compiling Objective-C++ files is available for this platform" .ENDIF "$(OS)"=="MACOSX" |