diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-12-12 01:07:09 +0200 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-12-25 17:53:25 +0000 |
| commit | c29098917a1118d4b435df2b5f542adc8505e123 (patch) | |
| tree | f9407e3cf21b49abb40d536f73364abbddcb5ea3 /bean | |
| parent | e5ccda4bb32eef8cab99c4d43c1571ec4bad3980 (diff) | |
Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check
whether OS is WNT or not instead.
Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34
Reviewed-on: https://gerrit.libreoffice.org/1304
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
Diffstat (limited to 'bean')
| -rw-r--r-- | bean/Library_officebean.mk | 4 | ||||
| -rw-r--r-- | bean/test/applet/oooapplet/makefile.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 2229e625157c..160d9c61c36c 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,officebean)) -ifeq ($(GUI),UNX) +ifneq ($(OS),WNT) $(eval $(call gb_Library_use_packages,officebean,\ sal_generated \ sal_inc \ @@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_cobjects,officebean,\ )) endif -ifeq ($(GUI),WNT) +ifeq ($(OS),WNT) $(eval $(call gb_Library_add_cobjects,officebean,\ bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow \ bean/native/win32/com_sun_star_beans_LocalOfficeWindow \ diff --git a/bean/test/applet/oooapplet/makefile.mk b/bean/test/applet/oooapplet/makefile.mk index edb68ffe1504..89c915a8df6b 100644 --- a/bean/test/applet/oooapplet/makefile.mk +++ b/bean/test/applet/oooapplet/makefile.mk @@ -52,7 +52,7 @@ COPY_FILES: example.html # --- Targets ------------------------------------------------------ -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" RUN: firefox "$(CLASSDIR)$/example.html?$(office)" .ELSE |