[pango/kill-modules: 8/13] Kill unused pangorc file

[Behdad Esfahbod <behdad src gnome org>]

commit 66b3bdf75b20a52fbc90ad7bbdad0ec4a64cc5ab
Author: Khaled Hosny <khaledhosny eglug org>
Date:   Sat Jul 26 10:05:00 2014 +0200

    Kill unused pangorc file

 modules/Makefile.am        |    3 +--
 modules/pangorc            |    3 ---
 pango-view/Makefile.am     |    9 +--------
 pango-view/viewer-render.c |   10 +---------
 tests/Makefile.am          |    9 +--------
 tests/dump-boundaries.c    |    2 --
 6 files changed, 4 insertions(+), 32 deletions(-)
---
diff --git a/modules/Makefile.am b/modules/Makefile.am
index a23364b..5883ea2 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -8,7 +8,6 @@ SUBDIRS =               \
 
 EXTRA_DIST =           \
        Module.mk       \
-       module.def      \
-       pangorc
+       module.def
 
 -include $(top_srcdir)/git.mk
diff --git a/pango-view/Makefile.am b/pango-view/Makefile.am
index 7b6e568..66a0881 100644
--- a/pango-view/Makefile.am
+++ b/pango-view/Makefile.am
@@ -26,8 +26,6 @@ TEST_TEXTS =                  \
 EXTRA_DIST =                   \
        $(TEST_TEXTS)
 
-CLEANFILES = pangorc
-
 INCLUDES =                             \
        -I$(top_srcdir)                 \
        $(PANGO_DEBUG_FLAGS)            \
@@ -80,7 +78,7 @@ endif
 
 MAINTAINERCLEANFILES = pango-view.1.in
 EXTRA_DIST += pango-view.1.in
-CLEANFILES += pango-view.1
+CLEANFILES = pango-view.1
 
 nodist_man_MANS = pango-view.1
 
@@ -100,9 +98,4 @@ pango-view.1: pango-view$(EXEEXT)
 
 #########################################################
 
-BUILT_SOURCES = pangorc
-
-pangorc: $(srcdir)/../modules/pangorc
-       cp $(srcdir)/../modules/pangorc $@
-
 -include $(top_srcdir)/git.mk
diff --git a/pango-view/viewer-render.c b/pango-view/viewer-render.c
index 8e3cc7f..47bb960 100644
--- a/pango-view/viewer-render.c
+++ b/pango-view/viewer-render.c
@@ -714,7 +714,7 @@ parse_options (int argc, char *argv[])
     {"output",         'o', 0, G_OPTION_ARG_STRING,                    &opt_output,
      "Save rendered image to output file",                           "file"},
     {"pangorc",                0, 0, G_OPTION_ARG_STRING,                      &opt_pangorc,
-     "pangorc file to use (default is ./pangorc)",                   "file"},
+     "Deprecated",                   "file"},
     {"pixels",         0, 0, G_OPTION_ARG_NONE,                        &opt_pixels,
      "Use pixel units instead of points (sets dpi to 72)",             NULL},
     {"rtl",            0, 0, G_OPTION_ARG_NONE,                        &opt_rtl,
@@ -812,14 +812,6 @@ parse_options (int argc, char *argv[])
   if (opt_markup &&
       !pango_parse_markup (text, -1, 0, NULL, NULL, NULL, &error))
     fail ("Cannot parse input as markup: %s", error->message);
-
-  /* Setup PANGO_RC_FILE
-   */
-  if (!opt_pangorc)
-    if (g_file_test ("./pangorc", G_FILE_TEST_IS_REGULAR))
-      opt_pangorc = "./pangorc";
-  if (opt_pangorc)
-    g_setenv ("PANGO_RC_FILE", opt_pangorc, TRUE);
 }
 
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 652c42f..264c9f2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,6 @@ EXTRA_DIST =                    \
        boundaries.utf8         \
        GraphemeBreakTest.txt
 
-CLEANFILES = pangorc
 DISTCLEANFILES = all-unicode.txt
 
 AM_CPPFLAGS =                                  \
@@ -40,8 +39,7 @@ endif
 TESTS_ENVIRONMENT =                    \
    srcdir=$(srcdir)                    \
    G_TEST_SRCDIR=$(abs_srcdir)         \
-   G_TEST_BUILDDIR=$(abs_builddir)     \
-   PANGO_RC_FILE=./pangorc
+   G_TEST_BUILDDIR=$(abs_builddir)
 
 check_PROGRAMS = testboundaries testboundaries_ucd testcolor testscript
 
@@ -74,11 +72,6 @@ cxx_test_SOURCES = cxx-test.C
 all-unicode.txt: gen-all-unicode$(EXEEXT)
        ./gen-all-unicode > all-unicode.txt
 
-pangorc: $(srcdir)/../modules/pangorc
-       cp $(srcdir)/../modules/pangorc $@
-
-$(noinst_PROGRAMS) $(check_PROGRAMS): pangorc
-
 noinst_PROGRAMS = $(check_PROGRAMS) gen-all-unicode dump-boundaries
 
 if BUILDOPT_INSTALL_TESTS
diff --git a/tests/dump-boundaries.c b/tests/dump-boundaries.c
index d71aa60..8fd4ee7 100644
--- a/tests/dump-boundaries.c
+++ b/tests/dump-boundaries.c
@@ -112,8 +112,6 @@ main (int    argc,
 {
   gchar *text;
 
-  g_setenv ("PANGO_RC_FILE", "./pangorc", TRUE);
-
   if (argc < 2)
     fail ("must give a filename on the command line");