diff options
Diffstat (limited to 'converter/other')
-rw-r--r-- | converter/other/jpeg2000/Makefile | 10 | ||||
-rw-r--r-- | converter/other/jpeg2000/libjasper/Makefile | 2 | ||||
-rw-r--r-- | converter/other/jpeg2000/libjasper/Makefile.common | 17 |
3 files changed, 12 insertions, 17 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: 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: |