diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-18 08:57:58 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-18 08:57:58 +0000 |
| commit | ce0c2b9232b851455139eae6a17c8198bb463666 (patch) | |
| tree | 240e0696673cf235cf120245e95c94d3124d5550 /redland | |
| parent | 1f69dbce6033666b8a82981e67564ddf8f1b23d3 (diff) | |
#i91599# Patch by mst: fix LDFLAGS and CPPFLAGS.
Diffstat (limited to 'redland')
| -rw-r--r-- | redland/raptor/makefile.mk | 11 | ||||
| -rw-r--r-- | redland/rasqal/makefile.mk | 11 | ||||
| -rw-r--r-- | redland/redland/makefile.mk | 11 |
3 files changed, 21 insertions, 12 deletions
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index ff3f28214a5b..90e27606b5b5 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.6 $ # # This file is part of OpenOffice.org. # @@ -81,11 +81,14 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" +# NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto +CPPFLAGS+:=-I$(SOLARINCDIR)$/external +LDFLAGS+:=-L$(SOLARLIBDIR) + .IF "$(SYSBASE)"!="" -CPPFLAGS+=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include +CPPFLAGS+:=-I$(SYSBASE)$/usr$/include .IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" -# NB: SOLARLIBDIR is first, because linux SYSBASE contains obsolete libcrypto -LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl +LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # "$(SYSBASE)"!="" diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index d01f265d050d..28905d5945ac 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # # This file is part of OpenOffice.org. # @@ -81,11 +81,14 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" +# NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto +CPPFLAGS+:=-I$(SOLARINCDIR)$/external +LDFLAGS+:=-L$(SOLARLIBDIR) + .IF "$(SYSBASE)"!="" -CPPFLAGS+=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include +CPPFLAGS+:=-I$(SYSBASE)$/usr$/include .IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" -# NB: SOLARLIBDIR is first, because linux SYSBASE contains obsolete libcrypto -LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl +LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # "$(SYSBASE)"!="" diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 434bc5e199c3..59758fd2d936 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # # This file is part of OpenOffice.org. # @@ -81,11 +81,14 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" +# NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto +CPPFLAGS+:=-I$(SOLARINCDIR)$/external +LDFLAGS+:=-L$(SOLARLIBDIR) + .IF "$(SYSBASE)"!="" -CPPFLAGS+=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include +CPPFLAGS+:=-I$(SYSBASE)$/usr$/include .IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" -# NB: SOLARLIBDIR is first, because linux SYSBASE contains obsolete libcrypto -LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl +LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # "$(SYSBASE)"!="" |