diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2014-07-26 10:05:00 +0200 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2015-04-04 16:13:07 -0700 |
commit | 39391e428afd6c2a7cc9892d9c3f46f88b856996 (patch) | |
tree | 0961f9fea88f1f30eec18e6206cbfef683f03a36 | |
parent | 81904127fe1107b6c0db4ce50c3d44cdf63b7f67 (diff) | |
download | pango-39391e428afd6c2a7cc9892d9c3f46f88b856996.tar.gz |
Kill unused pangorc file
-rw-r--r-- | modules/Makefile.am | 3 | ||||
-rw-r--r-- | modules/pangorc | 3 | ||||
-rw-r--r-- | pango-view/Makefile.am | 9 | ||||
-rw-r--r-- | pango-view/viewer-render.c | 10 | ||||
-rw-r--r-- | tests/Makefile.am | 9 | ||||
-rw-r--r-- | tests/dump-boundaries.c | 2 |
6 files changed, 4 insertions, 32 deletions
diff --git a/modules/Makefile.am b/modules/Makefile.am index a23364be..5883ea23 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/modules/pangorc b/modules/pangorc deleted file mode 100644 index 59d7dadf..00000000 --- a/modules/pangorc +++ /dev/null @@ -1,3 +0,0 @@ -# -# pangorc file for uninstalled operation. - diff --git a/pango-view/Makefile.am b/pango-view/Makefile.am index 7b6e568f..66a08815 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 8e3cc7f8..47bb960e 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 4043fb97..8f0f61f1 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 \ @@ -99,11 +97,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 markup_tests = \ diff --git a/tests/dump-boundaries.c b/tests/dump-boundaries.c index d71aa60f..8fd4ee74 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"); |