diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-24 19:22:59 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-24 19:22:59 +0200 |
commit | 01eada93cfc3abd68f4cf6070a848438ef68c7d8 (patch) | |
tree | 753d6d27cb18770254b4dbb5e28088da1aa5caeb /extensions/source | |
parent | 06ed8bfddc3a11536058b2c12366d47b28472e38 (diff) | |
parent | 6567385ff037ad3e20c168a07362b2a478686afe (diff) |
Merge branch 'master' into feature/gnumake4feature/gnumake4
Diffstat (limited to 'extensions/source')
-rw-r--r-- | extensions/source/activex/main/makefile.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk index e47701808..bdfe30642 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)"=="" |