[Libreoffice-commits] .: Branch 'integration/dev300_m101' - svx/source vbahelper/util

[Norbert Thiebaud]

 svx/source/form/makefile.mk |    8 +-------
 vbahelper/util/makefile.mk  |    5 -----
 2 files changed, 1 insertion(+), 12 deletions(-)

New commits:
commit d303501fa3e31c0df86ae74f3ae4a0894f0525b6
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Mar 14 23:09:13 2011 -0500

    ENABLE_VBA is no more

diff --git a/svx/source/form/makefile.mk b/svx/source/form/makefile.mk
index 44bcd53..1088283 100755
--- a/svx/source/form/makefile.mk
+++ b/svx/source/form/makefile.mk
@@ -40,13 +40,7 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-.IF "$(ENABLE_VBA)"=="YES"
-    CDEFS+=-DENABLE_VBA
-.ENDIF
-
-.IF "$(ENABLE_VBA)"=="YES"
-    CDEFS+=-DENABLE_VBA
-.ENDIF
+CDEFS+=-DENABLE_VBA
 
 SRS1NAME=form
 SRC1FILES= \
diff --git a/vbahelper/util/makefile.mk b/vbahelper/util/makefile.mk
index a09ffa5..48f4f93 100755
--- a/vbahelper/util/makefile.mk
+++ b/vbahelper/util/makefile.mk
@@ -34,11 +34,6 @@ TARGET=vbahelper
 
 .INCLUDE :  settings.mk
 
-.IF "$(ENABLE_VBA)" == "NO"
-dummy:
-    @echo "Nothing to build"
-.ENDIF
-
 TARGET_HELPER=vbahelper
 
 LIB1TARGET=     $(SLB)$/$(TARGET).lib