[librsvg: 1/6] Remove rsvg-view.c and its Makefile stuff



commit 44f8524f4492b7d91c2360a12843a66efe9f04fd
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Jul 2 11:58:56 2019 -0500

    Remove rsvg-view.c and its Makefile stuff
    
    Rsvg-view is a pretty crappy SVG viewer.
    
    Also, it adds a GTK dependency on librsvg.  This makes the whole
    dependency graph awkward, since GTK indirectly depends on librsvg via
    gdk-pixbuf.
    
    I think we are better off encouraging people to use image viewers that
    are actually well-written and pleasant to use, like EOG.

 Makefile.am                |  30 --
 rsvg-c-srcs.mk             |   1 -
 rsvg-view.c                | 783 ---------------------------------------------
 win32/build-rules-msvc.mak |   2 -
 win32/config-msvc.mak.in   |  18 --
 5 files changed, 834 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9480af35..072cdb8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,9 +7,6 @@ lib_LTLIBRARIES = librsvg-@RSVG_API_MAJOR_VERSION@.la
 noinst_LTLIBRARIES = librsvg_internals.la
 
 bin_PROGRAMS = rsvg-convert
-if HAVE_GTK_3
-bin_PROGRAMS += rsvg-view-3
-endif
 
 include rsvg-c-srcs.mk
 
@@ -240,33 +237,6 @@ rsvg_convert_LDADD = \
        $(RSVG_CONVERT_LIBS) \
        $(LIBM)
 
-rsvg_view_3_SOURCES =                  \
-       $(rsvg_view_srcs)
-
-rsvg_view_3_CPPFLAGS = \
-       -I$(top_srcdir)                         \
-       -I$(top_builddir)/librsvg               \
-       -DLIBRSVG_DATADIR="\"$(datadir)\""      \
-       $(AM_CPPFLAGS)
-
-rsvg_view_3_CFLAGS =\
-       $(GTK3_CFLAGS)          \
-       $(LIBRSVG_CFLAGS)       \
-       $(AM_CFLAGS)
-
-rsvg_view_3_LDFLAGS =
-
-rsvg_view_3_LDADD = \
-       $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la \
-       $(GTK3_LIBS)            \
-       $(LIBRSVG_LIBS)         \
-       $(GTHREAD_LIBS)         \
-       $(LIBM)
-
-if OS_WIN32
-rsvg_view_3_LDFLAGS += -mwindows
-endif # OS_WIN32
-
 dist_doc_DATA =                                \
        COMPILING.md                    \
        CONTRIBUTING.md                 \
diff --git a/rsvg-c-srcs.mk b/rsvg-c-srcs.mk
index f36efa0a..e46cbd08 100644
--- a/rsvg-c-srcs.mk
+++ b/rsvg-c-srcs.mk
@@ -17,4 +17,3 @@ librsvg_c_srcs =      \
        $(NULL)
 
 rsvg_convert_srcs = rsvg-convert.c
-rsvg_view_srcs = rsvg-view.c
\ No newline at end of file
diff --git a/win32/build-rules-msvc.mak b/win32/build-rules-msvc.mak
index 8c110fe3..863dbec3 100644
--- a/win32/build-rules-msvc.mak
+++ b/win32/build-rules-msvc.mak
@@ -79,7 +79,6 @@ $(GDK_PIXBUF_SVG_LOADER): $(LIBRSVG_LIB) $(OUTDIR)\rsvg-gdk-pixbuf-loader\io-svg
 # <<
 #      @-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
 $(OUTDIR)\rsvg-convert.exe: $(LIBRSVG_LIB) $(OUTDIR)\rsvg-tools\rsvg-convert.obj
-$(OUTDIR)\rsvg-view-3.exe: $(LIBRSVG_LIB) $(OUTDIR)\rsvg-tools\rsvg-view.obj
 
 $(OUTDIR)\rsvg-dimensions.exe: \
        $(LIBRSVG_LIB)  \
@@ -92,7 +91,6 @@ $(OUTDIR)\test-performance.exe:       \
        $(OUTDIR)\rsvg-tools\rsvg-tools-main.obj
 
 $(OUTDIR)\rsvg-convert.exe     \
-$(OUTDIR)\rsvg-view-3.exe      \
 $(OUTDIR)\rsvg-dimensions.exe  \
 $(OUTDIR)\test-performance.exe:
        link $(LDFLAGS) $** $(TOOLS_DEP_LIBS) /out:$@
diff --git a/win32/config-msvc.mak.in b/win32/config-msvc.mak.in
index 54d11d63..0300ef79 100644
--- a/win32/config-msvc.mak.in
+++ b/win32/config-msvc.mak.in
@@ -129,24 +129,6 @@ RSVG_EXTRA_TOOLS =                 \
        $(OUTDIR)\rsvg-dimensions.exe   \
        $(OUTDIR)\test-performance.exe
 
-# Build rsvg-view-3, which requires GTK
-!ifndef NO_GTK
-RSVG_TOOLS =                           \
-       $(RSVG_TOOLS)                   \
-       $(OUTDIR)\rsvg-view-3.exe
-
-TOOLS_DEP_INCLUDES =                   \
-       /I$(INCLUDEDIR)\gtk-3.0         \
-       /I$(INCLUDEDIR)\pango-1.0       \
-       /I$(INCLUDEDIR)\atk-1.0         \
-       $(TOOLS_DEP_INCLUDES)
-
-TOOLS_DEP_LIBS =               \
-       gtk-3.0.lib             \
-       gdk-3.0.lib             \
-       $(TOOLS_DEP_LIBS)
-!endif
-
 # Build Introspection if requested
 EXTRA_TARGETS = $(GDK_PIXBUF_SVG_LOADER)
 !ifdef INTROSPECTION


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]