Tag: cws_src680_evoab201 User: mmeeks Date: 05/04/15 13:24:24 Modified: /dba/connectivity/source/drivers/mozab/mozillasrc/ makefile.mk
Log: RESYNC: (1.13-1.15); FILE MERGED File Changes: Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/makefile.mk?r1=1.13.60.1&r2=1.13.60.2 Delta lines: +21 -31 --------------------- --- makefile.mk 8 Feb 2005 15:53:50 -0000 1.13.60.1 +++ makefile.mk 15 Apr 2005 20:24:21 -0000 1.13.60.2 @@ -64,8 +64,6 @@ #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 #End of mozilla specific stuff. PRJ=..$/..$/..$/.. @@ -86,13 +84,12 @@ .INCLUDE : settings.mk -.IF "$(OS)"=="MACOSX" || "$(SYSTEM_MOZILLA)" == "YES" +.IF "$(OS)"=="MACOSX" || ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" dummy: @echo " Not building the mozillasrc stuff in OpenOffice.org build" @echo " dependency to Mozilla developer snapshots not feasable at the moment" @echo " see http://bugzilla.mozilla.org/show_bug.cgi?id=135137"; - .ELSE .INCLUDE : $(PRJ)$/version.mk @@ -102,7 +99,6 @@ # --- Files ------------------------------------- SLOFILES = \ - $(SLO)$/MNSInit.obj \ $(SLO)$/MQueryHelper.obj \ $(SLO)$/MDatabaseMetaDataHelper.obj \ $(SLO)$/MQuery.obj \ @@ -119,15 +115,17 @@ .ENDIF # "$(COMNAME)"=="sunpro5" .ENDIF -.IF "$(GUI)" == "WNT" -.IF "$(DBG_LEVEL)" == "0" -INCPRE += . -I.. -I$(MOZ_INC) -I$(MOZ_INC)$/nspr -I$(MOZ_INC)$/xpcom \ +MOZINC = . -I.. -I..$/bootstrap -I$(MOZ_INC) -I$(MOZ_INC)$/nspr -I$(MOZ_INC)$/xpcom \ -I$(MOZ_INC)$/string -I$(MOZ_INC)$/rdf -I$(MOZ_INC)$/msgbase \ -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)$/uconv\ -I$(MOZ_INC)$/xpcom_obsolete -I$(MOZ_INC)$/content + +.IF "$(GUI)" == "WNT" +.IF "$(DBG_LEVEL)" == "0" +INCPRE += $(MOZINC) CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \ -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ @@ -135,16 +133,11 @@ -DOJI -DWIN32 -D_X86_ -D_WINDOWS \ -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \ -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \ - -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL + -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL \ + -UDEBUG CFLAGS += -GR- -W3 -Gy -MD -UDEBUG .ELSE -INCPRE += . -I.. -I$(MOZ_INC) -I$(MOZ_INC)$/nspr -I$(MOZ_INC)$/xpcom \ - -I$(MOZ_INC)$/string -I$(MOZ_INC)$/rdf -I$(MOZ_INC)$/msgbase \ - -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)$/xpcom_obsolete -I$(MOZ_INC)$/content +INCPRE += $(MOZINC) CDEFS += -DWINVER=0x400 -DMOZILLA_CLIENT \ -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \ -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \ @@ -152,22 +145,19 @@ -DOJI -DWIN32 -D_X86_ -D_WINDOWS \ -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \ -DDEBUG_Administrator -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \ - -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL -CFLAGS += -Zi -GR- -W3 -Gy -MDd -UNDEBUG + -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL \ + -UDEBUG +CFLAGS += -Zi -GR- -W3 -Gy -MDd -UDEBUG .ENDIF .ENDIF .IF "$(GUI)" == "UNX" -INCPOST += . -I.. -I$(MOZ_INC) -I$(MOZ_INC)$/nspr -I$(MOZ_INC)$/xpcom \ - -I$(MOZ_INC)$/string -I$(MOZ_INC)$/rdf -I$(MOZ_INC)$/msgbase \ - -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)$/xpcom_obsolete -I$(MOZ_INC)$/content +INCPOST += $(MOZINC) CDEFS+= -DMOZILLA_CLIENT \ - -DOSTYPE=\"Linux2.2.14-5\" -DOJI + -DXP_UNIX .IF "$(OS)" == "LINUX" CFLAGS += -fPIC -g +CDEFS+= -DOSTYPE=\"Linux2.2.14-5\" -DOJI + CFLAGSCXX += \ -fno-rtti -Wall -Wconversion -Wpointer-arith \ -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth \ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
