From 118ba884419d79e5bd2dd83a1e1a40b99ac64f65 Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Fri, 29 Sep 2006 16:14:55 +0000
Subject: Release 10.35.06

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@71 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 converter/other/jpeg2000/Makefile | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'converter/other/jpeg2000/Makefile')

diff --git a/converter/other/jpeg2000/Makefile b/converter/other/jpeg2000/Makefile
index 70cfafb7..528c5ab8 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:
-- 
cgit 1.4.1