diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-10-01 09:16:17 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-10-01 09:16:17 +0000 |
| commit | 41faa44b020686a511625a4bb92a2edc3c63bf12 (patch) | |
| tree | 9e2156864a4df7249f49bec576838f06dbe7ede4 /solenv/inc/unx.mk | |
| parent | 0f8d27d4b47a2a96061aefa9f5ebf755794e3259 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes62
2009-09-22 21:19:24 +0200 cmc r276365 : #i100000# that's the most plausible explanation, -D$(CVER) is needed by scp2 under windows
2009-09-19 16:10:36 +0200 cmc r276303 : #i100000# revert this for no partically good reason
2009-09-18 14:16:47 +0200 cmc r276279 : remove extra build depend
2009-09-18 08:56:15 +0200 cmc r276265 : #i100000# rerun autoconf
2009-09-17 14:59:38 +0200 cmc r276245 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk@276192 (milestone: DEV300:m59)
2009-09-10 16:40:49 +0200 pl r276041 : fix warning
2009-09-10 11:34:55 +0200 pl r276026 : disable warning from system header
2009-09-09 19:30:45 +0200 pl r276013 : use osl_getAsciiFunctionSymbol instead of strange cast
2009-09-09 19:25:32 +0200 pl r276012 : add some casting hacks to make compile on solaris cc
2009-09-09 19:10:48 +0200 pl r276009 : add missing Configure option for solaris sparce 32bit
2009-09-09 18:37:05 +0200 pl r276008 : merge fix for #i104525# into moved code
2009-09-07 13:28:08 +0200 cmc r275894 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk@275801 (milestone: DEV300:m57)
2009-08-28 12:36:27 +0200 cmc r275523 : CWS-TOOLING: rebase CWS cmcfixes62 to trunk@275331 (milestone: DEV300:m56)
2009-08-26 12:56:18 +0200 cmc r275413 : #i104088# use the right headers in the right place
2009-08-25 17:07:50 +0200 cmc r275372 : #i104500# make openssl build on linux that isn't x86 or x86_64
2009-08-25 13:08:48 +0200 cmc r275347 : #i89237# pretty picswitch up
2009-08-25 10:58:09 +0200 cmc r275342 : #i104489# remove last unused code in starmath
2009-08-25 10:23:33 +0200 cmc r275338 : #i104088# clean up the define post-move
2009-08-24 13:46:57 +0200 cmc r275310 : #i104088# 64bit odbc api changes
2009-08-24 13:42:52 +0200 cmc r275309 : #i89237# unify linux platform mks under a generic parent
2009-08-24 13:19:52 +0200 cmc r275307 : #i104455# remove unused code
2009-08-24 13:10:56 +0200 cmc r275306 : #i104088# 64bit odbc api changes
2009-08-24 10:07:50 +0200 cmc r275293 : #i104306# move recent-used to vcl
2009-08-24 09:32:08 +0200 cmc r275291 : #i104306# move recent-used to vcl
2009-08-23 22:01:07 +0200 cmc r275286 : #i104306# move recently-used to vcl
2009-08-22 15:25:25 +0200 cmc r275285 : #i104088# 64bit odbc api changes
2009-08-21 17:52:40 +0200 cmc r275268 : #i104306# move recently-used to vcl
2009-08-21 14:38:26 +0200 cmc r275257 : #i104408 make these headers ready for c++0x
2009-08-21 14:20:19 +0200 cmc r275251 : #i104406# avoid overlapping strcpy to avoid bustage on recent toolchains
2009-08-21 14:14:25 +0200 cmc r275250 : #i104385# silence 64bit warnings
Diffstat (limited to 'solenv/inc/unx.mk')
| -rw-r--r-- | solenv/inc/unx.mk | 50 |
1 files changed, 11 insertions, 39 deletions
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk index ff5349f62496..718e23c01b4e 100644 --- a/solenv/inc/unx.mk +++ b/solenv/inc/unx.mk @@ -83,67 +83,39 @@ .INCLUDE : unxscoi.mk .ENDIF -.IF "$(COM)$(OS)$(CPU)$(GLIBC)" == "GCCLINUXI" -.INCLUDE : unxlnxi.mk -.ENDIF - -.IF "$(COM)$(OS)$(CPU)$(GLIBC)" == "GCCLINUXP2" -.INCLUDE : unxlngp.mk -.ENDIF - .IF "$(COM)$(OS)$(CPU)" == "GCCLINUXS" .INCLUDE : unxlngs.mk .ENDIF -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC295LINUXI2REDHAT60" -.INCLUDE : unxlngi3.mk -.ENDIF - -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC300LINUXI2REDHAT60" -.INCLUDE : unxlngi4.mk -.ENDIF - -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC322LINUXI2REDHAT60" -.INCLUDE : unxlngi5.mk -.ENDIF - -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC341LINUXI2REDHAT60" -.INCLUDE : unxlngi6.mk +.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXI" +.INCLUDE : unxlngi.mk .ENDIF -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC432LINUXI2SUSE90" -.INCLUDE : unxlngi6.mk +.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXX" +.INCLUDE : unxlngx.mk .ENDIF -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC341LINUXX2REDHAT60" -.INCLUDE : unxlngx6.mk -.ENDIF - -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)" == "GCCC295LINUXP2REDHAT60" +.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUXPPOWERPC" .INCLUDE : unxlngppc.mk .ENDIF -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)$(CPUNAME)" == "GCCC300LINUXP2REDHAT60POWERPC" -.INCLUDE : unxlngppc4.mk -.ENDIF - -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)$(CPUNAME)" == "GCCC300LINUXP2REDHAT60POWERPC64" +.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUXPPOWERPC64" .INCLUDE : unxlngppc64.mk .ENDIF -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)$(CPUNAME)" == "GCCC300LINUX32REDHAT60S390" -.INCLUDE : unxlngs3904.mk +.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUX3S390" +.INCLUDE : unxlngs390.mk .ENDIF -.IF "$(COM)$(CVER)$(OS)$(CPU)$(GLIBC)$(CPUNAME)" == "GCCC300LINUX32REDHAT60S390X" +.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUX3S390X" .INCLUDE : unxlngs390x.mk .ENDIF -.IF "$(COM)$(OS)$(CPU)$(GLIBC)" == "GCCLINUXR2REDHAT60" +.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXR" .INCLUDE : unxlngr.mk .ENDIF -.IF "$(COM)$(OS)$(CPU)$(GLIBC)" == "GCCLINUXA2REDHAT60" +.IF "$(COM)$(OS)$(CPU)" == "GCCLINUXA" .INCLUDE : unxlnga.mk .ENDIF |