summaryrefslogtreecommitdiff
path: root/pango-view
diff options
context:
space:
mode:
Diffstat (limited to 'pango-view')
-rw-r--r--pango-view/Makefile.am9
-rw-r--r--pango-view/viewer-render.c10
2 files changed, 2 insertions, 17 deletions
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);
}