blob: efe9fd8dd3c4a05807eaedc11037cb112d455a97 (
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
|
when we disable the bundled libs, make sure we don't try to run install in them
--- a/converter/other/jbig/Makefile
+++ b/converter/other/jbig/Makefile
@@ -5,7 +5,7 @@ endif
SUBDIR = converter/other/jbig
VPATH=.:$(SRCDIR)/$(SUBDIR)
-SUBDIRS = libjbig
+SUBDIRS =
include $(BUILDDIR)/config.mk
@@ -35,6 +35,7 @@ SCRIPTS =
ifeq ($(JBIGLIB),$(INTERNAL_JBIGLIB))
JBIGLIB_DEP = $(JBIGLIB)
+ SUBDIRS += libjbig
else
# It's not our internal version; user's on his own to make sure it's built
endif
--- a/converter/other/jpeg2000/Makefile
+++ b/converter/other/jpeg2000/Makefile
@@ -5,7 +5,7 @@ endif
SUBDIR = converter/other/jpeg2000
VPATH=.:$(SRCDIR)/$(SUBDIR)
-SUBDIRS = libjasper
+SUBDIRS =
include $(BUILDDIR)/config.mk
@@ -52,6 +52,7 @@ ifeq ($(JASPERLIB),$(INTERNAL_JASPERLIB)
# MERGE_OBJECTS contains relative paths, so $(INTERNAL_JASPERLIB) had better
# be relative to the current directory.
MERGE_OBJECTS += $(JASPERLIB)
+ SUBDIRS += libjasper
endif
MERGEBINARIES = $(BINARIES)
|
GitWeb
