User: vg Date: 2008-08-18 13:09:53+0000 Modified: dba/connectivity/source/drivers/mozab/bootstrap/makefile.mk
Log: INTEGRATION: CWS cmcfixes48 (1.13.52); FILE MERGED 2008/07/24 13:16:23 cmc 1.13.52.1: #i92087# minimal firefox/etc profile finder implementation File Changes: Directory: /dba/connectivity/source/drivers/mozab/bootstrap/ ============================================================ File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/makefile.mk?r1=1.13&r2=1.14 Delta lines: +21 -14 --------------------- --- makefile.mk 2008-04-10 10:14:31+0000 1.13 +++ makefile.mk 2008-08-18 13:09:50+0000 1.14 @@ -51,30 +51,38 @@ .INCLUDE : settings.mk -.IF ("$(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" - -.ELSE - .INCLUDE : $(PRJ)$/version.mk #mozilla specific stuff. # --- Files ------------------------------------- -SLOFILES = \ - $(SLO)$/MMozillaBootstrap.obj \ - $(SLO)$/MNSFolders.obj \ +SLOFILES += \ + $(SLO)$/MNSINIParser.obj \ $(SLO)$/MNSProfileDiscover.obj \ + $(SLO)$/MMozillaBootstrap.obj \ + $(SLO)$/MNSFolders.obj + +.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" +CDEFS+=-DMINIMAL_PROFILEDISCOVER + +SHL1TARGET=$(TARGET) +SHL1OBJS=$(SLOFILES) + +SHL1STDLIBS=\ + $(CPPULIB) \ + $(CPPUHELPERLIB) \ + $(SALLIB) \ + $(COMPHELPERLIB) + +.ELSE +SLOFILES += \ $(SLO)$/MNSInit.obj \ $(SLO)$/MNSProfileManager.obj \ - $(SLO)$/MNSINIParser.obj \ $(SLO)$/MNSRunnable.obj \ $(SLO)$/MNSProfile.obj \ $(SLO)$/MNSProfileDirServiceProvider.obj - +.ENDIF .IF "$(GUI)"=="UNX" .IF "$(COMNAME)"=="sunpro5" @@ -158,7 +166,6 @@ -Wno-long-long CDEFS += -DTRACING .ENDIF -.ENDIF SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
