Commit 39391e42 authored by Khaled Hosny's avatar Khaled Hosny Committed by Behdad Esfahbod

Kill unused pangorc file

parent 81904127
......@@ -8,7 +8,6 @@ SUBDIRS = \
EXTRA_DIST = \
Module.mk \
module.def \
pangorc
module.def
-include $(top_srcdir)/git.mk
#
# pangorc file for uninstalled operation.
......@@ -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
......@@ -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);
}
......
......@@ -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 = \
......
......@@ -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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment