diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-09-29 16:14:55 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-09-29 16:14:55 +0000 |
commit | 118ba884419d79e5bd2dd83a1e1a40b99ac64f65 (patch) | |
tree | cdb1b1d8fad573577c02f62bcd46ca5fca8542b5 /converter/other/jpeg2000/libjasper | |
parent | 544d142e7efc6691a9d25cccb4b983e780f932fc (diff) | |
download | netpbm-mirror-118ba884419d79e5bd2dd83a1e1a40b99ac64f65.tar.gz netpbm-mirror-118ba884419d79e5bd2dd83a1e1a40b99ac64f65.tar.xz netpbm-mirror-118ba884419d79e5bd2dd83a1e1a40b99ac64f65.zip |
Release 10.35.06
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@71 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other/jpeg2000/libjasper')
-rw-r--r-- | converter/other/jpeg2000/libjasper/Makefile | 2 | ||||
-rw-r--r-- | converter/other/jpeg2000/libjasper/Makefile.common | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/converter/other/jpeg2000/libjasper/Makefile b/converter/other/jpeg2000/libjasper/Makefile index 73d263ec..ad4fbd8f 100644 --- a/converter/other/jpeg2000/libjasper/Makefile +++ b/converter/other/jpeg2000/libjasper/Makefile @@ -8,6 +8,8 @@ VPATH=.:$(SRCDIR)/$(SUBDIR) include $(BUILDDIR)/Makefile.config SUBDIRS = base jp2 jpc +LIB_OBJECTS = +JASPERSRCDIR = $(SRCDIR)/$(SUBDIR) # NOTE: The library source code uses 64 bit types, so you cannot # build it (compile will fail) if you don't have 64 bit types defined diff --git a/converter/other/jpeg2000/libjasper/Makefile.common b/converter/other/jpeg2000/libjasper/Makefile.common index 71a11832..56bcea0d 100644 --- a/converter/other/jpeg2000/libjasper/Makefile.common +++ b/converter/other/jpeg2000/libjasper/Makefile.common @@ -1,10 +1,12 @@ # -*-makefile-*- <-- an Emacs control -# This is common rules for the pnmtojpc subdirectories. +# This is common rules for the libjasper subdirectories. # # Set the following variables before including this: # -# LIB_OBJECTS: List of object files from this directory that go into -# libjasper. +# SUBDIRS: Subdirectory names +# LIB_OBJECTS: List of object files from this directory that go into +# libjasper. +# JASPERSRCDIR: libjasper source directory all: $(LIB_OBJECTS) partlist @@ -17,7 +19,7 @@ $(SUBDIRS:%=%/partlist): %/partlist: $(CURDIR)/% $(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \ SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) -INCLUDES = -I$(JASPERSRCDIR)/include -I$(JASPERSRCDIR)/importinc +INCLUDES = -I$(JASPERSRCDIR)/include -Iimportinc include $(SRCDIR)/Makefile.common @@ -26,12 +28,9 @@ DEFS = -DHAVE_LIBM=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_ $(LIB_OBJECTS):%.o:%.c $(CC) -c $(CFLAGS) $(INCLUDES) $(DEFS) $(CADD) $< -$(LIB_OBJECTS): $(JASPERSRCDIR)/importinc +$(LIB_OBJECTS): importinc -$(JASPERSRCDIR)/importinc: - $(MAKE) -C $(dir $@) $(notdir $@) - -clean: localclean +thisdirclean: localclean .PHONY: localclean localclean: |