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 /solenv/inc/tg_app.mk | |
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 'solenv/inc/tg_app.mk')
-rw-r--r-- | solenv/inc/tg_app.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk index 3e81367f9be4..3f1e11403e49 100644 --- a/solenv/inc/tg_app.mk +++ b/solenv/inc/tg_app.mk @@ -65,14 +65,14 @@ APP$(TNR)STDLIB+= -lvclmain .ENDIF .ENDIF -.IF "$(GUI)$(COM)" == "WNTGCC" +.IF "$(OS)$(COM)" == "WNTGCC" APP$(TNR)RESO= .IF "$(APP$(TNR)LINKRES)" != "" || "$(APP$(TNR)RES)" != "" APP$(TNR)RESO=$(MISC)/$(APP$(TNR)TARGET:b)_res.o .ENDIF .ENDIF -.IF "$(GUI)" == "UNX" +.IF "$(OS)" != "WNT" APP$(TNR)DEPN+:=$(APP$(TNR)DEPNU) USE_APP$(TNR)DEF= .ENDIF @@ -84,7 +84,7 @@ APP$(TNR)PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP$(TNR)PRODUCTNAME)\" .ENDIF # "$(APP$(TNR)PRODUCTNAME)"!="" .IF "$(linkinc)"!="" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(APP$(TNR)LIBS)"!="" $(MISC)/$(APP$(TNR)TARGET)_linkinc.ls .PHONY: @@-$(RM) $@ @@ -103,7 +103,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ $(APP$(TNR)RES) \ $(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF) @echo "Making: " $(@:f) -.IF "$(GUI)"=="UNX" +.IF "$(OS)"!="WNT" .IF "$(OS)"=="MACOSX" @-$(RM) $(MISC)/$(@:b).list @-$(RM) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd @@ -143,7 +143,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ .ENDIF .ENDIF # "$(OS)"=="MACOSX" .ENDIF -.IF "$(GUI)" == "WNT" +.IF "$(OS)" == "WNT" @@-$(MKDIR) $(@:d:d) .IF "$(APP$(TNR)LINKRES)" != "" @@-$(RM) $(MISC)/$(APP$(TNR)LINKRES:b).rc @@ -231,7 +231,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \ $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe .ENDIF # "$(TARGET)" == "setup" -.ENDIF # "$(GUI)" == "WNT" +.ENDIF # "$(OS)" == "WNT" .ENDIF # "$(APP$(TNR)TARGETN)"!="" |