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 /jvmfwk | |
| 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 'jvmfwk')
| -rw-r--r-- | jvmfwk/Library_sunjavaplugin.mk | 2 | ||||
| -rw-r--r-- | jvmfwk/Package_rcfiles.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index d32dc70aa22c..2d7326c4d1db 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -59,7 +59,7 @@ $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ )) endif -ifeq ($(GUI),WNT) +ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,sunjavaplugin,\ advapi32 \ )) diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk index 0d4c8ace65cf..fb5a392fd866 100644 --- a/jvmfwk/Package_rcfiles.mk +++ b/jvmfwk/Package_rcfiles.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Package_Package,jvmfwk_rcfiles,$(SRCDIR)/jvmfwk)) # The below files (intended to be also used during the build) need to go into # the same directory as dynamic libraries (either bin or lib): -ifeq ($(GUI),WNT) +ifeq ($(OS),WNT) jvmfwk_Package_RCFILESDIR := bin else jvmfwk_Package_RCFILESDIR := lib @@ -39,7 +39,7 @@ endif $(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(jvmfwk_Package_RCFILESDIR)/sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc)) $(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(jvmfwk_Package_RCFILESDIR)/jvmfwk3),source/jvmfwk3rc)) -ifeq ($(GUI),UNX) +ifneq ($(OS),WNT) ifeq ($(OS),FREEBSD) $(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml)) else ifeq ($(OS),MACOSX) @@ -51,7 +51,7 @@ $(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/ja else $(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml)) endif -else ifeq ($(GUI),WNT) +else ifeq ($(OS),WNT) $(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml)) else $(call gb_Output_error,Unsupported platform) |