summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sc/source/ui/vba/makefile.mk4
-rw-r--r--sc/source/ui/vba/testvba/makefile.mk5
-rw-r--r--sc/util/makefile.mk16
3 files changed, 0 insertions, 25 deletions
diff --git a/sc/source/ui/vba/makefile.mk b/sc/source/ui/vba/makefile.mk
index 5842b90237ff..dd489830b1c6 100644
--- a/sc/source/ui/vba/makefile.mk
+++ b/sc/source/ui/vba/makefile.mk
@@ -37,10 +37,6 @@ VISIBILITY_HIDDEN=TRUE
.INCLUDE : settings.mk
DLLPRE =
-.IF "$(ENABLE_VBA)"!="YES"
-dummy:
- @echo "not building vba..."
-.ENDIF
.IF "$(L10N_framework)"==""
INCPRE=$(INCCOM)$/$(TARGET)
diff --git a/sc/source/ui/vba/testvba/makefile.mk b/sc/source/ui/vba/testvba/makefile.mk
index fb131f314ed3..534085e326e1 100644
--- a/sc/source/ui/vba/testvba/makefile.mk
+++ b/sc/source/ui/vba/testvba/makefile.mk
@@ -36,11 +36,6 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
DLLPRE =
-.IF "$(ENABLE_VBA)"!="YES"
-dummy:
- @echo "not building vba..."
-.ENDIF
-
INCPRE=$(INCCOM)$/$(TARGET)
CDEFS+=-DVBA_OOBUILD_HACK
# ------------------------------------------------------------------
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index b564d0e86c27..dd0a6043c8fd 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -283,8 +283,6 @@ LIB8OBJFILES = \
$(SLO)$/dpgroupdlg.obj \
$(SLO)$/editfield.obj
-.IF "$(ENABLE_VBA)"=="YES"
-
TARGET_VBA=vbaobj
SHL9TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno
SHL9IMPLIB= i$(TARGET_VBA)
@@ -292,11 +290,7 @@ SHL9IMPLIB= i$(TARGET_VBA)
SHL9VERSIONMAP=$(SOLARENV)/src/component.map
SHL9DEF=$(MISC)$/$(SHL9TARGET).def
DEF9NAME=$(SHL9TARGET)
-.IF "$(VBA_EXTENSION)"=="YES"
-SHL9RPATH=OXT
-.ELSE
SHL9RPATH=OOO
-.ENDIF
SHL9STDLIBS= \
$(VBAHELPERLIB) \
@@ -328,22 +322,12 @@ SHL9LIBS=$(SLB)$/$(TARGET_VBA).lib
LIBCOMPNAME=$(COMMONBIN)$/$(SHL9TARGET)$(DLLPOST)
.ENDIF
-.ENDIF
-
-
# --- Targets -------------------------------------------------------------
.INCLUDE : target.mk
-.IF "$(VBA_EXTENSION)"=="YES"
- COMP=build_extn
-.ENDIF
-
ALLTAR: $(MISC)$/linkinc.ls $(COMP)
-build_extn : $(SHL9TARGETN)
- $(PERL) createExtPackage.pl $(COMMONBIN)$/vbaapi.oxt $(SOLARBINDIR)$/oovbaapi.rdb $(LIBCOMPNAME)
-
ALLTAR : $(MISC)/sc.component $(MISC)/scd.component $(MISC)/vbaobj.component
$(MISC)/sc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \