[gimp] Remove gimp-remote for good, it has been disabled since 2008
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] Remove gimp-remote for good, it has been disabled since 2008
- Date: Sat, 30 Jul 2011 17:01:03 +0000 (UTC)
commit 2356aad3dac38d665b6f785bc76b49f82fb45128
Author: Michael Natterer <mitch gimp org>
Date: Sat Jul 30 18:59:39 2011 +0200
Remove gimp-remote for good, it has been disabled since 2008
configure.ac | 26 +----
docs/.gitignore | 1 -
docs/Makefile.am | 4 +-
docs/gimp-remote.1.in | 87 ------------
tools/.gitignore | 3 +-
tools/Makefile.am | 30 +----
tools/gimp-remote-x11.c | 331 -----------------------------------------------
tools/gimp-remote.c | 267 --------------------------------------
tools/gimp-remote.h | 37 ------
9 files changed, 4 insertions(+), 782 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9464f2a..72ecf70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -947,16 +947,6 @@ if test "x$enable_mp" != "xno"; then
fi
-###################################################
-# gimp-remote is obsolete, but can still be enabled
-###################################################
-
-AC_ARG_ENABLE(gimp-remote,
- [ --enable-gimp-remote build gimp-remote utility (default=no)],
- enable_gimp_remote=yes,
- enable_gimp_remote="no (not enabled)")
-
-
################################
# Some plug-ins are X11 specific
################################
@@ -1013,20 +1003,8 @@ AC_SUBST(SCREENSHOT_LIBS)
AC_SUBST(DOC_SHOOTER)
-if test x"$enable_gimp_remote" = xyes; then
- enable_gimp_remote="$have_libxmu"
-fi
-
-if test x"$enable_gimp_remote" = xyes; then
- GIMP_REMOTE='gimp-remote-gimp_app_version$(EXEEXT)'
- GIMP_REMOTE_MANPAGE='gimp-remote-gimp_app_version.1'
- GIMP_COMMAND='gimp-remote-gimp_app_version'
-else
- GIMP_COMMAND='gimp-gimp_app_version'
-fi
+GIMP_COMMAND='gimp-gimp_app_version'
-AC_SUBST(GIMP_REMOTE)
-AC_SUBST(GIMP_REMOTE_MANPAGE)
AC_SUBST(GIMP_COMMAND)
@@ -2245,7 +2223,6 @@ AC_CONFIG_FILES(
docs/gimp-gimp_app_version.1:docs/gimp.1.in
docs/gimprc-gimp_app_version.5:docs/gimprc.5.in
docs/gimptool-gimp_tool_version.1:docs/gimptool.1.in
-docs/gimp-remote-gimp_app_version.1:docs/gimp-remote.1.in
gimp-gimp_pkgconfig_version.pc:gimp.pc.in
gimpthumb-gimp_pkgconfig_version.pc:gimpthumb.pc.in
gimpui-gimp_pkgconfig_version.pc:gimpui.pc.in
@@ -2267,7 +2244,6 @@ Desktop files install into $DESKTOP_DATADIR
Extra Binaries:
gimp-console: $enable_gimp_console
- gimp-remote: $enable_gimp_remote
Optional Features:
D-Bus service: $have_dbus_glib
diff --git a/docs/.gitignore b/docs/.gitignore
index 3713ba6..3292440 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -2,7 +2,6 @@
/Makefile.in
/gimp-2.*.1
/gimprc-2.*.5
-/gimp-remote-2.*.1
/gimptool-2.0.1
/Wilber.xcf
/Wilber_Construction_Kit.xcf
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 02af952..b4e3161 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,15 +1,13 @@
## Process this file with automake to produce Makefile.in
EXTRA_DIST = \
- gimp-remote.1.in \
Wilber.xcf.gz \
Wilber.xcf.gz.README \
Wilber_Construction_Kit.xcf.gz
mans = \
gimp-$(GIMP_APP_VERSION).1 \
- gimprc-$(GIMP_APP_VERSION).5 \
- $(GIMP_REMOTE_MANPAGE)
+ gimprc-$(GIMP_APP_VERSION).5
man_MANS = \
$(mans) \
diff --git a/tools/.gitignore b/tools/.gitignore
index 6534d0f..4c7fef5 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -3,8 +3,7 @@
/.deps
/.libs
/kernelgen
-/gimp-remote-2.7
/gimptool-2.0
/gimptool-2.0.exe
/test-clipboard
-/test-clipboard.exe
\ No newline at end of file
+/test-clipboard.exe
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 16dfb60..6128f57 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,23 +8,13 @@ endif
SUBDIRS = $(D_pdbgen)
-bin_PROGRAMS = $(GIMP_REMOTE) gimptool-2.0
+bin_PROGRAMS = gimptool-2.0
noinst_PROGRAMS = test-clipboard
EXTRA_PROGRAMS = \
- gimp-remote-2.7 \
kernelgen
-gimp_remote_2_7_SOURCES = \
- gimp-remote.c \
- gimp-remote.h \
- gimp-remote-x11.c
-
-gimp_remote_2_7_LDADD = \
- $(GTK_LIBS) \
- $(XMU_LIBS)
-
gimptool_2_0_SOURCES = \
gimptool.c
@@ -69,21 +59,3 @@ EXTRA_DIST = \
defcheck.py \
gimp-mkenums \
gimppath2svg.py
-
-
-install-exec-hook:
-if DEFAULT_BINARY
- if test -f "$(DESTDIR)$(bindir)/gimp-remote- GIMP_APP_VERSION@"; then \
- echo "cd $(DESTDIR)$(bindir)"; \
- cd $(DESTDIR)$(bindir); \
- echo "rm -f gimp-remote"; \
- rm -f gimp-remote; \
- echo "$(LN_S) gimp-remote- GIMP_APP_VERSION@ gimp-remote"; \
- $(LN_S) gimp-remote- GIMP_APP_VERSION@ gimp-remote; \
- fi
-endif
-
-uninstall-local:
-if DEFAULT_BINARY
- rm -f $(DESTDIR)$(bindir)/gimp-remote
-endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]