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 /icu | |
| 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 'icu')
| -rw-r--r-- | icu/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index 5494fa554f45..f20d9b5f223f 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -85,7 +85,7 @@ EXTRA_CDEFS+=-DU_HAVE_GCC_ATOMICS=0 # Describe it in the comment above instead. CONFIGURE_ACTION=unzip $(TARFILE_LOCATION)/$(ICU_DATA_SUBSET_ZIP) && mv icudt49l.dat data/in && -.IF "$(GUI)"=="UNX" +.IF "$(OS)"!="WNT" .IF "$(SYSBASE)"!="" icu_CFLAGS+=-I$(SYSBASE)$/usr$/include @@ -236,7 +236,7 @@ OUT2BIN_NONE= \ .ENDIF -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" CONFIGURE_DIR=source .IF "$(COM)"=="GCC" .IF "$(MINGW_SHARED_GCCLIB)"=="YES" @@ -305,7 +305,7 @@ OUT2BIN= \ $(BUILD_DIR)$/bin$/gencmn.exe .ENDIF -.ENDIF # "$(GUI)"=="WNT" +.ENDIF # "$(OS)"=="WNT" #make sure that when we deliver the headers of a new icu that the timestamps #are newer than the last icu to ensure dependencies are correctly rebuilt @@ -327,7 +327,7 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary .ENDIF -.IF "$(GUI)$(COM)"=="WNTGCC" +.IF "$(OS)$(COM)"=="WNTGCC" ALLTAR : \ $(LB)$/icudata.lib \ $(LB)$/icuin$(ICU_BUILD_LIBPOST).lib \ |