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

connectivity/source/drivers/mozab/bootstrap/makefile.mk

@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.13 $
+# $Revision: 1.14 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -51,30 +51,38 @@ ENVCFLAGS+=/FR$(SLO)$/
 
 .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	\
-    $(SLO)$/MNSProfileDiscover.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 @@ CFLAGSCXX += \
             -Wno-long-long
 CDEFS     += -DTRACING
 .ENDIF
-.ENDIF
 
 SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)