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/pstrules.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/pstrules.mk')
| -rw-r--r-- | solenv/inc/pstrules.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk index 4b285b171a34..a930d31ba035 100644 --- a/solenv/inc/pstrules.mk +++ b/solenv/inc/pstrules.mk @@ -34,7 +34,7 @@ $(OBJ)/$(SECOND_BUILD)_%.obj : %.cxx @echo "Making: " $@ -.IF "$(GUI)"=="UNX" +.IF "$(OS)"!="WNT" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx .IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"=="" @@ -48,7 +48,7 @@ $(OBJ)/$(SECOND_BUILD)_%.obj : %.cxx $(OBJ)/$(SECOND_BUILD)_%.obj : %.c @echo "Making: " $@ -.IF "$(GUI)"=="UNX" +.IF "$(OS)"!="WNT" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $*.c .ELSE @@ -76,7 +76,7 @@ $(OBJ)/$(SECOND_BUILD)_%.obj : %.c $(SLO)/$(SECOND_BUILD)_%.obj : %.cxx @echo "Making: " $@ -.IF "$(GUI)"=="UNX" +.IF "$(OS)"!="WNT" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx .IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"=="" @@ -94,7 +94,7 @@ $(SLO)/$(SECOND_BUILD)_%.obj : %.cxx $(SLO)/$(SECOND_BUILD)_%.obj : %.c @echo "Making: " $@ -.IF "$(GUI)"=="UNX" +.IF "$(OS)"!="WNT" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$(SECOND_BUILD)_$*.o $*.c .IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"=="" @@ -125,7 +125,7 @@ ALLPARFILES=$(uniq $(ULFPARFILES) $(MOREPARFILES)) SCP_PRODUCT_TYPE*=FAT -.IF "$(GUI)" == "WNT" +.IF "$(OS)" == "WNT" LANGFILEEXT=mlf .ELSE LANGFILEEXT=jlf @@ -134,7 +134,7 @@ LANGFILEEXT=jlf $(PAR)/%.par : @echo "Making: " $@ @@-$(MKDIR) $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))} -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(CROSS_COMPILING)" == "NO" $(COMMAND_ECHO)$(CPPLCC) -+ -P $(INCLUDE) $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre .ELSE @@ -142,7 +142,7 @@ $(PAR)/%.par : .ENDIF .ENDIF # YD: INCLUDE macro too long, include only few items (scp2 compile) -.IF "$(GUI)"=="UNX" +.IF "$(OS)"!="WNT" $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cpp.lcc -+ -P $(CDEFS) $(SCPDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(SOLARINC) $(*:b).scp > $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre .ENDIF $(COMMAND_ECHO)$(SCPCOMP) -l {$(MISC)/$(TARGET)/$(@:b).$(LANGFILEEXT)} -s $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).pre -o $@ |