diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-06 09:35:51 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-06-20 11:51:10 +0000 |
| commit | ae1bb97f14cd12100d230cbf16b762aefa04decf (patch) | |
| tree | cfcd28ce6e29708e1aa17bdd0d417df13c289d14 /extensions | |
| parent | 5f00be141d86e3eadddd554cd9d18ebe47d4d59b (diff) | |
remove last uses of config 'GUI' variable
Change-Id: I97188235f0b72b5b54423e05deeaf17c5c681048
Reviewed-on: https://gerrit.libreoffice.org/4188
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Library_npsoplugin.mk | 6 | ||||
| -rw-r--r-- | extensions/Library_pl.mk | 11 |
2 files changed, 5 insertions, 12 deletions
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 90d4880f2f6b..74bdb8ae24fa 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -45,9 +45,7 @@ $(eval $(call gb_Library_add_defs,npsoplugin,\ )) endif -endif # GUI=UNX - -ifeq ($(OS),WNT) +else ifeq ($(OS),WNT) $(eval $(call gb_Library_use_static_libraries,npsoplugin,\ ooopathutils \ @@ -95,7 +93,7 @@ endif $(eval $(call gb_Library_set_nativeres,npsoplugin,npsoplugin/npsoplugin)) -endif # GUI=WNT +endif $(eval $(call gb_Library_add_exception_objects,npsoplugin,\ extensions/source/nsplugin/source/npshell \ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index 3970fdf80719..102217a50fe2 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -55,11 +55,8 @@ $(eval $(call gb_Library_add_exception_objects,pl,\ extensions/source/plugin/win/winmgr \ extensions/source/plugin/win/sysplug \ )) -endif # GUI=WNT -ifneq ($(OS),WNT) - -ifeq ($(OS),MACOSX) +else ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_objcxxobjects,pl,\ extensions/source/plugin/aqua/macmgr \ @@ -72,7 +69,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,pl,\ CoreFoundation \ )) -else # OS!=MACOSX +else ifeq ($(ENABLE_GTK),TRUE) $(eval $(call gb_Library_add_defs,pl,\ @@ -96,9 +93,7 @@ $(eval $(call gb_Library_add_libs,pl,\ -lX11 \ )) -endif # OS=MACOSX - -endif # GUI=UNX +endif $(eval $(call gb_Library_use_libraries,pl,\ tk \ |