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 /instsetoo_native | |
| 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 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk | 2 | ||||
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk index 30293dd1a339..de56007682fa 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk @@ -43,7 +43,7 @@ MLFFILES = $(foreach,i,$(ULFFILES) $(MISC)$/$(TARGET)$/$(i:b).mlf) .INCLUDE : target.mk -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" ALLTAR : $(MLFFILES) diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index e4dd09f1bdeb..574ce4c3251d 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -34,11 +34,11 @@ TARGET=util # PERL:=@echo # watch for the path delimiter -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" PYTHONPATH:=$(PWD)$/$(BIN);$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload -.ELSE # "$(GUI)"=="WNT" +.ELSE # "$(OS)"=="WNT" PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$/python$/lib-dynload -.ENDIF # "$(GUI)"=="WNT" +.ENDIF # "$(OS)"=="WNT" .EXPORT: PYTHONPATH ENABLE_DOWNLOADSETS*=TRUE @@ -91,19 +91,19 @@ xxxx: .IF "$(LIBO_DEV_INSTALL)" == "TRUE" ALLTAR: openoffice_$(defaultlangiso).archive .ELSE -.IF "$(GUI)"!="WNT" && "$(EPM)"=="NO" +.IF "$(OS)"!="WNT" && "$(EPM)"=="NO" ALLTAR : $(LOCALPYFILES) @echo "No EPM: do no packaging at this stage" -.ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO" +.ELSE # "$(OS)"!="WNT" && "$(EPM)"=="NO" .IF "$(ENABLE_RELEASE_BUILD)"=="TRUE" .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" ALLTAR : openofficeall $(OOOHELPPACK) .ELSE ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) .ENDIF .ELSE -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" ALLTAR : openofficeall $(OOOHELPPACK) sdkooall .ELSE ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) sdkoo_en-US @@ -111,20 +111,20 @@ ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) .ENDIF .ELSE # "$(ENABLE_RELEASE_BUILD)"=="TRUE" .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" ALLTAR : openofficedevall $(OOODEVHELPPACK) .ELSE ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOODEVHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) .ENDIF .ELSE -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" ALLTAR : openofficedevall $(OOODEVHELPPACK) sdkoodevall .ELSE ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOODEVHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) sdkoodev_en-US .ENDIF .ENDIF .ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE" -.ENDIF # "$(GUI)"!="WNT" && "$(EPM)"=="NO" +.ENDIF # "$(OS)"!="WNT" && "$(EPM)"=="NO" .ENDIF # "$(LIBO_DEV_INSTALL)" == "TRUE" .IF "$(MAKETARGETS:e)"!="" @@ -316,7 +316,7 @@ openoffice: $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} lotest_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive}) updatepack : $(LOCALPYFILES) .ENDIF # "$(LOCALPYFILES)"!="" -.IF "$(GUI)"!="WNT" +.IF "$(OS)"!="WNT" $(BIN)$/%.py : $(OUTDIR)$/lib$/pyuno$/%.py $(COPY) $< $@ .ELSE |