diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-09-23 22:11:37 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-09-23 22:11:37 +0000 |
| commit | 828446fcb6e397de339f36ace9e84ac608c16c06 (patch) | |
| tree | 016a54fcb06e4e57e78a429ae8e9e473db614ca9 /converter/other/jpeg2000/libjasper | |
| parent | 0b1d0f960b66463943492d1123e82fe550d36e8d (diff) | |
| download | netpbm-mirror-828446fcb6e397de339f36ace9e84ac608c16c06.tar.gz netpbm-mirror-828446fcb6e397de339f36ace9e84ac608c16c06.tar.xz netpbm-mirror-828446fcb6e397de339f36ace9e84ac608c16c06.zip | |
Fix build with separate build directory
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@67 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 84781769..7737f2c0 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 @@ -19,19 +21,16 @@ $(SUBDIRS:%=%/partlist): %/partlist: $(CURDIR)/% include $(SRCDIR)/Makefile.common -INCLUDES = -I$(JASPERSRCDIR)/include -I$(JASPERSRCDIR)/importinc +INCLUDES = -I$(JASPERSRCDIR)/include -Iimportinc DEFS = -DHAVE_LIBM=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STDDEF_H=1 -DEXCLUDE_BMP_SUPPORT -DEXCLUDE_RAS_SUPPORT -DEXCLUDE_MIF_SUPPORT -DEXCLUDE_JPG_SUPPORT -DEXCLUDE_PGX_SUPPORT -DEXCLUDE_PNM_SUPPORT $(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: |