diff options
Diffstat (limited to 'converter/other/jpeg2000/Makefile')
| -rw-r--r-- | converter/other/jpeg2000/Makefile | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/converter/other/jpeg2000/Makefile b/converter/other/jpeg2000/Makefile index c5e74361..92225818 100644 --- a/converter/other/jpeg2000/Makefile +++ b/converter/other/jpeg2000/Makefile @@ -18,7 +18,7 @@ endif # INTERNAL_JASPERLIB must be relative to the current directory, because it # may end up in MERGE_OBJECTS, which must be relative. INTERNAL_JASPERLIB = libjasper/libjasper.a -INTERNAL_JASPERHDR_DIR = libjasper/include +INTERNAL_JASPERHDR_DIR = $(SRCDIR)/$(SUBDIR)/libjasper/include ifeq ($(JASPERLIB),$(INTERNAL_JASPERLIB)) ifeq ($(HAVE_INT64),Y) @@ -63,15 +63,9 @@ $(BINARIES): %: %.o $(JASPERLIB_DEP) $(NETPBMLIB) $(LIBOPT) $(LD) $(LDFLAGS) $(MATHLIB) $(LDLIBS) -o $@ $< \ $(LIBOPTS) $(JASPERDEPLIBS) -lm $(RPATH) $(LADD) -$(INTERNAL_JASPERLIB): FORCE +$(INTERNAL_JASPERLIB): $(BUILDDIR)/$(SUBDIR)/libjasper FORCE $(MAKE) -f $(SRCDIR)/$(SUBDIR)/libjasper/Makefile \ -C $(dir $@) $(notdir $@) -clean: localclean - -.PHONY: localclean -localclean: - $(MAKE) -f $(SRCDIR)/$(SUBDIR)/libjasper/Makefile -C libjasper clean - .PHONY: FORCE FORCE: |