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 /bridges | |
| 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 'bridges')
| -rw-r--r-- | bridges/Library_java_uno.mk | 2 | ||||
| -rw-r--r-- | bridges/test/java_uno/acquire/makefile.mk | 2 | ||||
| -rw-r--r-- | bridges/test/java_uno/any/makefile.mk | 2 | ||||
| -rw-r--r-- | bridges/test/java_uno/equals/makefile.mk | 2 | ||||
| -rw-r--r-- | bridges/test/java_uno/nativethreadpool/makefile.mk | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/bridges/Library_java_uno.mk b/bridges/Library_java_uno.mk index d9b8112b0282..178a008192eb 100644 --- a/bridges/Library_java_uno.mk +++ b/bridges/Library_java_uno.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Library_Library,java_uno)) -ifeq ($(GUI)$(COM),WNTGCC) +ifeq ($(OS)$(COM),WNTGCC) ifeq ($(EXCEPTIONS),sjlj) $(eval $(call gb_Library_add_defs,java_uno,\ -DBROKEN_ALLOCA \ diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk index 89f120e6b0d7..e7da44f59fb7 100644 --- a/bridges/test/java_uno/acquire/makefile.mk +++ b/bridges/test/java_uno/acquire/makefile.mk @@ -48,7 +48,7 @@ ALLTAR: \ $(BIN)$/testacquire-native-client \ $(BIN)$/testacquire-native-server -.IF "$(GUI)" == "WNT" +.IF "$(OS)" == "WNT" GIVE_EXEC_RIGHTS = @echo .ELSE # GUI, WNT GIVE_EXEC_RIGHTS = chmod +x diff --git a/bridges/test/java_uno/any/makefile.mk b/bridges/test/java_uno/any/makefile.mk index f29550a94e9c..549ea76fa2f9 100644 --- a/bridges/test/java_uno/any/makefile.mk +++ b/bridges/test/java_uno/any/makefile.mk @@ -26,7 +26,7 @@ ENABLE_EXCEPTIONS = TRUE .INCLUDE: settings.mk -.IF "$(GUI)" == "WNT" +.IF "$(OS)" == "WNT" GIVE_EXEC_RIGHTS = @echo .ELSE GIVE_EXEC_RIGHTS = chmod +x diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk index fc6ad343f68f..a49dea6b5849 100644 --- a/bridges/test/java_uno/equals/makefile.mk +++ b/bridges/test/java_uno/equals/makefile.mk @@ -51,7 +51,7 @@ JARFILES = juh.jar jurt.jar ridl.jar ALLTAR: $(BIN)$/testequals -.IF "$(GUI)" == "WNT" +.IF "$(OS)" == "WNT" GIVE_EXEC_RIGHTS = @echo .ELSE # GUI, WNT GIVE_EXEC_RIGHTS = chmod +x diff --git a/bridges/test/java_uno/nativethreadpool/makefile.mk b/bridges/test/java_uno/nativethreadpool/makefile.mk index 97eee2b2965e..0d46ddb4d42d 100644 --- a/bridges/test/java_uno/nativethreadpool/makefile.mk +++ b/bridges/test/java_uno/nativethreadpool/makefile.mk @@ -88,7 +88,7 @@ $(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \ $(REGCOMP) -register -r $(MISC)$/$(TARGET)$/bootstrap.rdb \ -c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) \ -c stocservices.uno$(DLLPOST) -.IF "$(GUI)" == "WNT" +.IF "$(OS)" == "WNT" ERROR -- missing platform .ELSE # GUI, WNT + export OO_JAVA_PROPERTIES='RuntimeLib=$(JVM_LIB_URL)' && \ @@ -98,7 +98,7 @@ $(BIN)$/$(TARGET).rdb .ERRREMOVE: $(MISC)$/$(TARGET)$/types.rdb \ .ENDIF # GUI, WNT test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).uno.jar $(BIN)$/$(TARGET).rdb -.IF "$(GUI)" == "WNT" +.IF "$(OS)" == "WNT" ERROR -- missing platform .ELSE # GUI, WNT $(AUGMENT_LIBRARY_PATH) uno -c test.javauno.nativethreadpool.server \ |