diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-05-02 02:28:29 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2015-05-02 02:28:29 +0000 |
| commit | d7e14787c49408da8bc52359699dfd06b200d8b5 (patch) | |
| tree | dcc475d22a3d7f7b24878c9f61c1f0f7d8fab4aa /converter/other/jpeg2000 | |
| parent | 177823c4c89a4e8af6ce79aa7d200f28c8df4bb8 (diff) | |
| download | netpbm-mirror-d7e14787c49408da8bc52359699dfd06b200d8b5.tar.gz netpbm-mirror-d7e14787c49408da8bc52359699dfd06b200d8b5.tar.xz netpbm-mirror-d7e14787c49408da8bc52359699dfd06b200d8b5.zip | |
Don't build and install libjjbig, libjasper if we are using external versions
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2477 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other/jpeg2000')
| -rw-r--r-- | converter/other/jpeg2000/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/converter/other/jpeg2000/Makefile b/converter/other/jpeg2000/Makefile index 009232d7..6e5af8e7 100644 --- 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) |