diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-05-18 12:32:54 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-05-18 12:32:54 +0000 |
| commit | 9d31c8a527f5e7a11476b818f9122b4989d9a341 (patch) | |
| tree | 3d29c0c13f08f7ab549c3335b520f96f9b1bc0ea /editors/openoffice-1.1-devel/files | |
| parent | Make setup start. Patch from Alexander N. Kabaev (diff) | |
Update to mozilla 1.0RC2, like the OO people did yesterday.
Notes
Notes:
svn path=/head/; revision=59428
Diffstat (limited to 'editors/openoffice-1.1-devel/files')
| -rw-r--r-- | editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk | 63 |
1 files changed, 55 insertions, 8 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk index 49a5008ebeff..4dd2ea9705f2 100644 --- a/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk +++ b/editors/openoffice-1.1-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk @@ -1,11 +1,58 @@ ---- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Apr 23 20:47:57 2002 -+++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Tue Apr 23 20:50:30 2002 -@@ -144,7 +144,7 @@ - -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap +--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Tue Mar 19 12:56:24 2002 ++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Sat May 18 14:16:19 2002 +@@ -62,10 +62,10 @@ + CALL_CDECL=TRUE + + #mozilla specific stuff. +-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) +-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla +-#MOZ_LIB=$(PRJ)$/$(INPATH)$/lib +-#MOZ_INC=$(PRJ)$/$(INPATH)$/inc$/mozilla ++#MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT) ++#MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla ++MOZ_LIB=$(PRJ)$/..$/moz$/$(INPATH)$/lib ++MOZ_INC=$(PRJ)$/..$/moz$/$(INPATH)$/inc$/mozilla + #End of mozilla specific stuff. + + PRJ=..$/..$/..$/.. +@@ -107,7 +107,7 @@ + -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ + -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ + -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ +- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap ++ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr + CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \ + -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ + -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ +@@ -123,7 +123,7 @@ + -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ + -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ + -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ +- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap ++ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr + CDEFS += -DDEBUG -DWINVER=0x400 -DMOZILLA_CLIENT \ + -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ + -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ +@@ -141,7 +141,7 @@ + -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \ + -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \ + -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \ +- -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap ++ -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/ldap-nspr CDEFS+= -DMOZILLA_CLIENT \ -DOSTYPE=\"Linux2.2.14-5\" -DOJI --.IF "$(OS)" == "LINUX" -+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" - CFLAGS += -fPIC -g - CFLAGSCXX += \ + .IF "$(OS)" == "LINUX" +@@ -157,6 +157,13 @@ -fno-rtti -Wall -Wconversion -Wpointer-arith \ + -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ + -Wno-long-long ++CDEFS += -DTRACING ++.ELIF "$(OS)" == "FREEBSD" ++CFLAGS += -fPIC ++CFLAGSCXX += \ ++ -fno-rtti -Wall -Wconversion -Wpointer-arith \ ++ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ ++ -Wno-long-long -pthread + CDEFS += -DTRACING + .ENDIF + .ENDIF |