From 78d36f8a3ef9e3c57f3a95a78741490cc0bac143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B5ivo=20Leedj=C3=A4rv?= <69477666+tleedjarv@users.noreply.github.com> Date: Wed, 14 Jul 2021 20:34:39 +0200 Subject: [PATCH] Remove last remnants of uigtk --- src/.depend | 4 ---- src/Makefile.OCaml | 9 --------- src/dune | 2 +- src/linkgtk.ml | 19 ------------------- 4 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 src/linkgtk.ml diff --git a/src/.depend b/src/.depend index 18de14148..dd6781641 100644 --- a/src/.depend +++ b/src/.depend @@ -503,10 +503,6 @@ globals.cmi : \ path.cmi \ lwt/lwt.cmi \ common.cmi -linkgtk.cmo : \ - main.cmo -linkgtk.cmx : \ - main.cmx linkgtk2.cmo : \ uigtk2.cmi \ main.cmo diff --git a/src/Makefile.OCaml b/src/Makefile.OCaml index c60af62f9..0c0186177 100644 --- a/src/Makefile.OCaml +++ b/src/Makefile.OCaml @@ -69,13 +69,11 @@ OCAMLLIBDIR=$(shell ocamlc -v | tail -1 | sed -e 's/.* //g' | tr '\\' '/' | tr - # User interface style: # Legal values are # UISTYLE=text -# UISTYLE=gtk # UISTYLE=gtk2 # UISTYLE=mac # # This should be set to an appropriate value automatically, depending # on whether the lablgtk library is available -LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk3 ##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well ## at the moment and we don't want to confuse people by building it by default @@ -262,13 +260,6 @@ endif # CFLAGS+=-cclib /subsystem:windows # endif -# Gtk GUI -ifeq ($(UISTYLE), gtk) - CAMLFLAGS+=-I +lablgtk - OCAMLOBJS+=pixmaps.cmo uigtk.cmo linkgtk.cmo - OCAMLLIBS+=lablgtk.cma -endif - # Gtk2 GUI OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null) diff --git a/src/dune b/src/dune index fc052e220..7dbc4b4df 100644 --- a/src/dune +++ b/src/dune @@ -1,7 +1,7 @@ (library (name unison_lib) (wrapped false) - (modules :standard \ linktext linkgtk linkgtk2 uigtk2 uimacbridge uimacbridgenew test) + (modules :standard \ linktext linkgtk2 uigtk2 uimacbridge uimacbridgenew test) (modules_without_implementation ui) (flags :standard -w -3-6-9-10-26-27-32-34-35-38-39-50-52 diff --git a/src/linkgtk.ml b/src/linkgtk.ml deleted file mode 100644 index a77759362..000000000 --- a/src/linkgtk.ml +++ /dev/null @@ -1,19 +0,0 @@ -(* Unison file synchronizer: src/linkgtk.ml *) -(* Copyright 1999-2020, Benjamin C. Pierce - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*) - - -module TopLevel = Main.Body(Uigtk.Body)