Tag: cws_src680_evoab201 User: mmeeks Date: 05/04/15 13:24:16 Modified: /dba/connectivity/source/drivers/mozab/ makefile.mk
Log: RESYNC: (1.15-1.18); FILE MERGED File Changes: Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/makefile.mk?r1=1.15.44.1&r2=1.15.44.2 Delta lines: +21 -9 -------------------- --- makefile.mk 8 Feb 2005 15:53:49 -0000 1.15.44.1 +++ makefile.mk 15 Apr 2005 20:24:13 -0000 1.15.44.2 @@ -64,12 +64,12 @@ PRJNAME=connectivity TARGET=$(MOZAB_TARGET) TARGET2=$(MOZAB_TARGET)drv -.IF "$(OS)"=="MACOSX" || "$(SYSTEM_MOZILLA)" == "YES" + +.IF "$(OS)"=="MACOSX" || ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" all: @echo " Not building the mozabsrc 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"; - .ENDIF #mozilla specific stuff. @@ -122,7 +122,7 @@ # --- Recursiveness --------------------------------------------------- -RC_SUBDIRS = mozillasrc +RC_SUBDIRS = mozillasrc bootstrap # --- Files ------------------------------------- @@ -130,6 +130,7 @@ $(SLO)$/MDriver.obj \ $(SLO)$/MServices.obj + # --- MOZAB BASE Library ----------------------------------- SHL1VERSIONMAP= $(TARGET).map @@ -166,7 +167,15 @@ $(SLO)$/MTypeConverter.obj \ $(SLO)$/MNameMapper.obj \ $(SLO)$/MNSMozabProxy.obj \ - $(SLO)$/MNSTerminateListener.obj + $(SLO)$/MNSTerminateListener.obj \ + $(SLO)$/MMozillaBootstrap.obj \ + $(SLO)$/MNSFolders.obj \ + $(SLO)$/MNSProfileDiscover.obj \ + $(SLO)$/MNSProfileManager.obj \ + $(SLO)$/MNSINIParser.obj \ + $(SLO)$/MNSRunnable.obj \ + $(SLO)$/MNSProfile.obj \ + $(SLO)$/MNSProfileDirServiceProvider.obj SLO2FILES=\ @@ -197,9 +206,12 @@ $(SALLIB) \ $(DBTOOLSLIB) \ $(COMPHELPERLIB) \ - -lmsgbaseutil \ $(MOZ_LIB_XPCOM) +.IF "$(GUI)"=="WNT" + SHL2STDLIBS += \ + shell32.lib +.ENDIF # "$(GUI)"=="WNT" SHL2DEPN= SHL2IMPLIB= i$(TARGET2) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
