summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvisvgm/TLpatches/patch-08-makefiles
blob: a9d592c59c6d5285ab5280d4d681e188f41c8372 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
--- dvisvgm-3.0.2/./Makefile.am	2023-01-17 00:55:33.000000000 -0800
+++ dvisvgm-src/./Makefile.am	2023-02-01 15:05:49.038254644 -0800
@@ -4,9 +4,9 @@
 ## Process this file with automake.
 
-include $(top_srcdir)/aminclude_static.am
+include $(top_srcdir)/dvisvgm-src/aminclude_static.am
 
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = COPYING
-SUBDIRS = libs src tests doc
+SUBDIRS = libs src #not for TL: m4 tests doc
 ACLOCAL_AMFLAGS = -I m4
 
--- dvisvgm-3.0.2/./libs/defs.am	2022-12-06 08:13:36.000000000 -0800
+++ dvisvgm-src/./libs/defs.am	2023-02-01 15:07:30.036487762 -0800
@@ -5,6 +5,14 @@
 
 if !HAVE_POTRACE
-POTRACE_CFLAGS = -I$(dvisvgm_srcdir)/libs/potrace
-POTRACE_LIBS = ../libs/potrace/libpotrace.a
+# Gets automake warnings:
+#   dvisvgm-src/src/../libs/defs.am:9: warning: POTRACE_LIBS was already defined in condition TRUE, which includes condition !HAVE_POTRACE and !TEXLIVE_BUILD ...
+#   dvisvgm-src/src/Makefile.am:14:   'dvisvgm-src/src/../libs/defs.am' included from here
+#   configure.ac:51: ... 'POTRACE_LIBS' previously defined here
+#if !TEXLIVE_BUILD
+#POTRACE_CFLAGS = -I$(dvisvgm_srcdir)/libs/potrace
+#POTRACE_LIBS = ../libs/potrace/libpotrace.a
+#else
+POTRACE_CFLAGS = $(POTRACE_INCLUDES)
+#endif TEXLIVE_BUILD
 endif
 
--- dvisvgm-3.0.2/./libs/Makefile.am	2023-01-17 00:55:33.000000000 -0800
+++ dvisvgm-src/./libs/Makefile.am	2023-02-01 15:05:49.038254644 -0800
@@ -4,5 +4,9 @@
 ## Process this file with automake.
 
-SUBDIRS = boost clipper md5 potrace variant xxHash
+SUBDIRS = boost clipper md5 variant xxHash
+
+if !TEXLIVE_BUILD
+SUBDIRS += potrace
+endif
 
 if ENABLE_WOFF
--- dvisvgm-3.0.2/./src/Makefile.am	2023-01-17 00:55:33.000000000 -0800
+++ dvisvgm-src/./src/Makefile.am	2023-02-01 15:05:49.038254644 -0800
@@ -17,8 +17,6 @@
 	$(noinst_LTLIBRARIES) \
 	../libs/clipper/libclipper.a \
-	$(FREETYPE_LIBS) \
 	$(POTRACE_LIBS) \
-	$(XXHASH_LIBS) \
-	$(ZLIB_LIBS)
+	$(XXHASH_LIBS)
 
 if ENABLE_WOFF
@@ -36,5 +34,16 @@
 endif
 
+dvisvgm_LDADD += \
+	$(KPATHSEA_LIBS) \
+	$(FREETYPE2_LIBS) \
+	$(ZLIB_LIBS) \
+	$(LIBGS_LIBS)
+
 dvisvgm_DEPENDENCIES = $(noinst_LTLIBRARIES)
+dvisvgm_DEPENDENCIES += $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(FREETYPE2_DEPEND)
+
+if TEXLIVE_BUILD
+dvisvgm_DEPENDENCIES += $(POTRACE_DEPEND)
+endif
 
 libdvisvgm_la_SOURCES = \
@@ -171,19 +180,25 @@
 EXTRA_DIST = options.xml options.dtd iapi.h ierrors.h MiKTeXCom.hpp MiKTeXCom.cpp
 
-AM_CFLAGS = -Wall \
-	$(ZLIB_CFLAGS) \
+AM_CFLAGS = $(WARNING_CFLAGS) \
+	$(ZLIB_INCLUDES) \
 	$(CODE_COVERAGE_CFLAGS)
 
-AM_CXXFLAGS = -Wall -Wnon-virtual-dtor \
+AM_CXXFLAGS = $(WARNING_CXXFLAGS) -Wnon-virtual-dtor \
 	-I$(dvisvgm_srcdir)/libs/clipper \
-	-I$(dvisvgm_srcdir)/libs/variant/include \
-	$(KPSE_CFLAGS) \
-	$(FREETYPE_CFLAGS) \
-	$(ZLIB_CFLAGS) \
-	$(CODE_COVERAGE_CFLAGS)
+	-I$(dvisvgm_srcdir)/libs/variant/include
 
 AM_CXXFLAGS += \
 	$(POTRACE_CFLAGS) \
-	$(XXHASH_CFLAGS)
+	$(XXHASH_CFLAGS) \
+	$(KPATHSEA_INCLUDES) \
+	$(POTRACE_INCLUDES) \
+	$(FREETYPE2_INCLUDES) \
+	$(ZLIB_INCLUDES) \
+	$(LIBGS_INCLUDES) \
+	$(CODE_COVERAGE_CFLAGS)
+
+if WIN32
+AM_CXXFLAGS += -DTEXLIVEWIN32
+endif WIN32
 
 AM_LDFLAGS = \
@@ -207,5 +222,6 @@
 endif
 
-
+# TL: do not try to rebuild these source files.
+if !TEXLIVE_BUILD
 
 # the command-line parser class is generated from options.xml by opt2cpp
@@ -221,4 +237,16 @@
 
 psdefs.ps: ;
+endif !TEXLIVE_BUILD
 
 CLEANFILES = *.gcda *.gcno
+
+if TEXLIVE_BUILD
+# Rebuild libkpathsea:
+@KPATHSEA_RULE@
+# Rebuild libfreetype:
+@FREETYPE2_RULE@
+# Rebuild libz:
+@ZLIB_RULE@
+# Rebuild potrace:
+@POTRACE_RULE@
+endif TEXLIVE_BUILD