Left: | ||
Right: |
OLD | NEW |
---|---|
1 # -*-Makefile-*- | 1 # -*-Makefile-*- |
2 | 2 |
3 MISSING_OPTIONAL = @OPTIONAL@ | 3 MISSING_OPTIONAL = @OPTIONAL@ |
4 MISSING_REQUIRED = @REQUIRED@ | 4 MISSING_REQUIRED = @REQUIRED@ |
5 | 5 |
6 # @configure_input@ | 6 # @configure_input@ |
7 | 7 |
8 ################################################################ | 8 ################################################################ |
9 ## FLAGS | 9 ## FLAGS |
10 ################################################################ | 10 ################################################################ |
11 | 11 |
12 FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ | 12 FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ |
13 GUILE_CFLAGS = @GUILE_CFLAGS@ | 13 GUILE_CFLAGS = @GUILE_CFLAGS@ |
14 PANGO_FT2_CFLAGS = @PANGO_FT2_CFLAGS@ | 14 PANGO_FT2_CFLAGS = @PANGO_FT2_CFLAGS@ |
15 GLIB_CLFAGS = @GLIB_CFLAGS@ @GOBJECT_CFLAGS@ | 15 GLIB_CLFAGS = @GLIB_CFLAGS@ @GOBJECT_CFLAGS@ |
16 | 16 |
17 CONFIG_CPPFLAGS = @CPPFLAGS@ | 17 CONFIG_CPPFLAGS = @CPPFLAGS@ |
18 CONFIG_DEFINES = @DEFINES@ | 18 CONFIG_DEFINES = @DEFINES@ |
19 | 19 |
20 CONFIG_CFLAGS = @CFLAGS@ $(GLIB_CFLAGS) $(GUILE_CFLAGS) \ | 20 CONFIG_CFLAGS = @CFLAGS@ $(GLIB_CFLAGS) $(GUILE_CFLAGS) \ |
21 $(FREETYPE2_CFLAGS) $(PANGO_FT2_CFLAGS) | 21 $(FREETYPE2_CFLAGS) $(PANGO_FT2_CFLAGS) |
22 CONFIG_CXXFLAGS = @CXXFLAGS@ $(GUILE_CFLAGS) $(FREETYPE2_CFLAGS) \ | 22 CONFIG_CXXFLAGS = @CXXFLAGS@ $(GUILE_CFLAGS) $(FREETYPE2_CFLAGS) \ |
23 $(PANGO_FT2_CFLAGS) | 23 $(PANGO_FT2_CFLAGS) |
24 | 24 |
25 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 25 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
26 GUILE_LIBS = @GUILE_LDFLAGS@ | 26 |
27 # need -pthread from CFLAGS to avoid linking errors. | |
28 GUILE_LIBS = @GUILE_LIBS@ @GUILE_CFLAGS@ | |
hahnjo
2020/02/21 17:42:00
Can be $(GUILE_CFLAGS), already substituted above
hanwenn
2020/02/21 19:15:00
Done.
| |
29 | |
27 FREETYPE2_LIBS = @FREETYPE2_LIBS@ | 30 FREETYPE2_LIBS = @FREETYPE2_LIBS@ |
28 PANGO_FT2_LIBS = @PANGO_FT2_LIBS@ | 31 PANGO_FT2_LIBS = @PANGO_FT2_LIBS@ |
29 CXXABI_LIBS = @CXXABI_LIBS@ | 32 CXXABI_LIBS = @CXXABI_LIBS@ |
30 GLIB_LIBS = @GLIB_LIBS@ @GOBJECT_LIBS@ | 33 GLIB_LIBS = @GLIB_LIBS@ @GOBJECT_LIBS@ |
31 | 34 |
32 CONFIG_LIBS = @LIBS@ @EXTRA_LIBS@ $(GLIB_LIBS) $(GUILE_LIBS) \ | 35 CONFIG_LIBS = @LIBS@ @EXTRA_LIBS@ $(GLIB_LIBS) $(GUILE_LIBS) \ |
33 $(PANGO_FT2_LIBS) $(FONTCONFIG_LIBS) \ | 36 $(PANGO_FT2_LIBS) $(FONTCONFIG_LIBS) \ |
34 $(FREETYPE2_LIBS) | 37 $(FREETYPE2_LIBS) |
35 CONFIG_LDFLAGS = @LDFLAGS@ | 38 CONFIG_LDFLAGS = @LDFLAGS@ |
36 | 39 |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
116 EXTRACTPDFMARK = @EXTRACTPDFMARK@ | 119 EXTRACTPDFMARK = @EXTRACTPDFMARK@ |
117 FIND = @FIND@ | 120 FIND = @FIND@ |
118 FCLIST = @FCLIST@ | 121 FCLIST = @FCLIST@ |
119 FLEX = @FLEX@ | 122 FLEX = @FLEX@ |
120 FLEXLEXER_FILE = @FLEXLEXER_FILE@ | 123 FLEXLEXER_FILE = @FLEXLEXER_FILE@ |
121 FONTFORGE = @FONTFORGE@ | 124 FONTFORGE = @FONTFORGE@ |
122 GROFF = @GROFF@ | 125 GROFF = @GROFF@ |
123 GS920 = @GS920@ | 126 GS920 = @GS920@ |
124 GUILE = @GUILE@ | 127 GUILE = @GUILE@ |
125 GUILE_CFLAGS = @GUILE_CFLAGS@ | 128 GUILE_CFLAGS = @GUILE_CFLAGS@ |
126 GUILE_CONFIG = @GUILE_CONFIG@ | 129 GUILE_CONFIG = @GUILE_CONFIG@ |
hahnjo
2020/02/21 17:42:00
Please remove these GUILE_CFLAGS (there's another
| |
127 LD = @LD@ | 130 LD = @LD@ |
128 LINK_GXX_STATICALLY = @LINK_GXX_STATICALLY@ | 131 LINK_GXX_STATICALLY = @LINK_GXX_STATICALLY@ |
129 LN = @LN@ | 132 LN = @LN@ |
130 LN_S = @LN_S@ | 133 LN_S = @LN_S@ |
131 LN_SRC_TO_BUILD = @LN_SRC_TO_BUILD@ | 134 LN_SRC_TO_BUILD = @LN_SRC_TO_BUILD@ |
132 MAKEINFO_PROGRAM = @MAKEINFO@ | 135 MAKEINFO_PROGRAM = @MAKEINFO@ |
133 TEXI2HTML_PROGRAM = @TEXI2HTML@ | 136 TEXI2HTML_PROGRAM = @TEXI2HTML@ |
134 METAFONT = @METAFONT@ -progname=mf | 137 METAFONT = @METAFONT@ -progname=mf |
135 MFMODE = @MFMODE@ | 138 MFMODE = @MFMODE@ |
136 MSGFMT = @MSGFMT@ | 139 MSGFMT = @MSGFMT@ |
137 PAPERSIZE=a4 | 140 PAPERSIZE=a4 |
138 PATHSEP = @PATHSEP@ | 141 PATHSEP = @PATHSEP@ |
139 PDFTEX = @PDFTEX@ | 142 PDFTEX = @PDFTEX@ |
140 PDFLATEX = @PDFLATEX@ | 143 PDFLATEX = @PDFLATEX@ |
141 PERL = @PERL@ | 144 PERL = @PERL@ |
142 PLATFORM_WINDOWS = @PLATFORM_WINDOWS@ | 145 PLATFORM_WINDOWS = @PLATFORM_WINDOWS@ |
143 PYTHON = @PYTHON@ -tt | 146 PYTHON = @PYTHON@ -tt |
144 TARGET_PYTHON = @PYTHON@ -tt | 147 TARGET_PYTHON = @PYTHON@ -tt |
145 TIDY = @TIDY@ | 148 TIDY = @TIDY@ |
146 RANLIB = @RANLIB@ | 149 RANLIB = @RANLIB@ |
147 ROOTSEP = @ROOTSEP@ | 150 ROOTSEP = @ROOTSEP@ |
148 SHELL = @SHELL@ | 151 SHELL = @SHELL@ |
149 TAR = @TAR@ | 152 TAR = @TAR@ |
150 WINDRES = @WINDRES@ | 153 WINDRES = @WINDRES@ |
151 YACC = @YACC@ | 154 YACC = @YACC@ |
152 ZIP = @ZIP@ | 155 ZIP = @ZIP@ |
OLD | NEW |