summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-24 19:22:59 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-07-24 19:22:59 +0200
commit9ba466ac25b2abb45f1de8a2785552949f007572 (patch)
treeb5aab7e747c91ac026f38727f78b72bf08f57345 /extensions
parenta04ab6817fd70c73efa6f792d446936bc0531480 (diff)
parenta814b12a68cc60a3bb7bff4336aae3665b048148 (diff)
Merge branch 'master' into feature/gnumake4
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/activex/main/makefile.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk
index e4770180886c..bdfe30642730 100644
--- a/extensions/source/activex/main/makefile.mk
+++ b/extensions/source/activex/main/makefile.mk
@@ -32,10 +32,6 @@ TARGET=so_activex
use_shl_versions=
# --- Settings ----------------------------------
-.IF "$(GUI)" == "WNT" && "$(DISABLE_ACTIVEX)"==""
-PROF_EDITION=TRUE
-.ENDIF
-
.INCLUDE : settings.mk
.IF "$(GUI)" == "WNT" && "$(DISABLE_ACTIVEX)"==""