[Libreoffice-commits] .: extensions/Library_pl.mk extensions/Module_extensions.mk Repository.mk

[Thorsten Behrens]

 Repository.mk                   |    2 +-
 extensions/Library_pl.mk        |    6 ------
 extensions/Module_extensions.mk |    4 ++++
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 84c33ebf343b543255e5dac007ad1396552144d2
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Tue Jan 10 17:33:05 2012 +0100

    Make nsplugin build on Mac, take two.
    
    Now with some help from Michael Stahl - seems to work.

diff --git a/Repository.mk b/Repository.mk
index bd7a13e..f030d16 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -99,7 +99,7 @@ endif
 
 ifneq ($(WITH_MOZILLA),NO)
 $(eval $(call gb_Helper_register_executables,OOO,\
-	nspugin \
+       nsplugin \
 	pluginapp.bin \
 ))
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index 8e66c36..cbe3dd0 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -98,12 +98,6 @@ $(eval $(call gb_Library_add_objcxxobjects,pl,\
 	extensions/source/plugin/aqua/sysplug \
 ))
 
-$(eval $(call gb_Library_set_include,pl,\
-	$$(INCLUDE) \
-	-I$(FRAMEWORKSHOME)/ApplicationServices.framework/Version/Current/Frameworks/QD.framework/Headers \
-	-I$(FRAMEWORKSHOME)/Carbon.framework/Versions/Current/Frameworks/HIToolbox.framework/Versions/Current/Headers \
-))
-
 $(eval $(call gb_Library_use_externals,pl,\
     cocoa \
     carbon \
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 62caaf6..f63e31a 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -93,10 +93,14 @@ endif # GUI=WNT
 
 ifeq ($(GUI),UNX)
 
+ifneq ($(GUIBASE),aqua)
+
 $(eval $(call gb_Module_add_targets,extensions,\
 	Executable_pluginapp.bin \
 ))
 
+endif # GUIBASE!=aqua
+
 ifneq ($(ENABLE_GTK),)
 $(eval $(call gb_Module_add_targets,extensions,\
 	Library_npsoplugin \