blob: db9efef3a5e1e06a6de3ee8a85dc7a9f8a270da9 (
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
|
http://bugs.gentoo.org/137871
--- converter/other/Makefile
+++ converter/other/Makefile
@@ -7,14 +7,6 @@
include $(BUILDDIR)/Makefile.config
-ifeq ($(shell xml2-config --version),)
- XML2_LIBS=NONE
- XML2_CFLAGS=NONE
-else
- XML2_LIBS=$(shell xml2-config --libs)
- XML2_CFLAGS=$(shell xml2-config --cflags)
-endif
-
SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam pamtosvg
ifneq ($(BUILD_FIASCO), N)
SUBDIRS += fiasco
@@ -101,7 +93,7 @@
BINARIES += pnmtops
endif
-ifneq ($(XML2LIBS),NONE)
+ifneq ($(XML2_LIBS),NONE)
BINARIES += svgtopam
endif
--- Makefile.config.in
+++ Makefile.config.in
@@ -419,6 +419,16 @@
ZHDR_DIR =
#ZLIB = libz.so
+# The XML2 library
+
+ifeq ($(shell xml2-config --version),)
+ XML2_LIBS=NONE
+ XML2_CFLAGS=NONE
+else
+ XML2_LIBS=$(shell xml2-config --libs)
+ XML2_CFLAGS=$(shell xml2-config --cflags)
+endif
+
# The JBIG lossless image compression library (aka JBIG-KIT):
JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a
|
GitWeb
