[Libreoffice-commits] .: Branch 'integration/dev300_m98' - basic/source scripting/source vbahelper/source

Michael Meeks michael at kemper.freedesktop.org
Mon Mar 7 04:46:57 PST 2011


 basic/source/classes/makefile.mk       |   11 -----------
 scripting/source/dlgprov/makefile.mk   |   10 ----------
 scripting/source/vbaevents/makefile.mk |   11 -----------
 vbahelper/source/msforms/makefile.mk   |   10 ----------
 vbahelper/source/vbahelper/makefile.mk |   12 ------------
 5 files changed, 54 deletions(-)

New commits:
commit dda57f18036e49eea46161e0f6789ac81ba60425
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Mar 7 12:43:20 2011 +0000

    build vba in offuh, requires a move of oovbaapi to ure; misc sw fixes

diff --git a/basic/source/classes/makefile.mk b/basic/source/classes/makefile.mk
index e00ed46..2302139 100644
--- a/basic/source/classes/makefile.mk
+++ b/basic/source/classes/makefile.mk
@@ -37,17 +37,6 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
-ALLTAR .SEQUENTIAL : \
-        $(MISC)$/$(TARGET).don \
-        $(MISC)$/$(TARGET).slo
-
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-        +$(CPPUMAKER) -O$(OUT)$/inc -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-        echo $@
-
-$(MISC)$/$(TARGET).slo : $(SLOTARGET)
-        echo $@
-
 # --- Allgemein -----------------------------------------------------------
 
 SLOFILES=	\
diff --git a/scripting/source/dlgprov/makefile.mk b/scripting/source/dlgprov/makefile.mk
index 1145c2c..8fbe388 100644
--- a/scripting/source/dlgprov/makefile.mk
+++ b/scripting/source/dlgprov/makefile.mk
@@ -71,16 +71,6 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib
 
 # ------------------------------------------------------------------
 
-ALLTAR : \
-        $(MISC)$/$(TARGET).don \
-
-$(SLOFILES) : $(MISC)$/$(TARGET).don
-
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-        echo $@
- 
-
 ALLTAR : $(MISC)/dlgprov.component
 
 $(MISC)/dlgprov.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
diff --git a/scripting/source/vbaevents/makefile.mk b/scripting/source/vbaevents/makefile.mk
index b76ca51..9ee037c 100644
--- a/scripting/source/vbaevents/makefile.mk
+++ b/scripting/source/vbaevents/makefile.mk
@@ -77,14 +77,3 @@ SHL1LIBS=$(SLB)$/$(TARGET).lib
 
 .INCLUDE :	target.mk
 
-# ------------------------------------------------------------------
-
-ALLTAR : \
-        $(MISC)$/$(TARGET).don \
-
-$(SLOFILES) : $(MISC)$/$(TARGET).don
-
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-        echo $@
- 
diff --git a/vbahelper/source/msforms/makefile.mk b/vbahelper/source/msforms/makefile.mk
index 30ce221..000999b 100644
--- a/vbahelper/source/msforms/makefile.mk
+++ b/vbahelper/source/msforms/makefile.mk
@@ -66,13 +66,3 @@ SLOFILES=\
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-ALLTAR : \
-        $(MISC)$/$(TARGET).don \
-
-$(SLOFILES) : $(MISC)$/$(TARGET).don
-
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-        echo $@
-
diff --git a/vbahelper/source/vbahelper/makefile.mk b/vbahelper/source/vbahelper/makefile.mk
index 52f6f2b..e1995ec 100644
--- a/vbahelper/source/vbahelper/makefile.mk
+++ b/vbahelper/source/vbahelper/makefile.mk
@@ -76,15 +76,3 @@ SLOFILES=\
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-ALLTAR : \
-        $(MISC)$/$(TARGET).don \
-
-$(SLOFILES) : $(MISC)$/$(TARGET).don
-
-$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb
-        +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@
-        echo $@
-
-
-


More information about the Libreoffice-commits mailing list