diff options
Diffstat (limited to 'converter/other/jpeg2000')
| -rw-r--r-- | converter/other/jpeg2000/Makefile | 5 | ||||
| -rw-r--r-- | converter/other/jpeg2000/libjasper/Makefile.common | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/converter/other/jpeg2000/Makefile b/converter/other/jpeg2000/Makefile index 528c5ab8..bf3f5e4a 100644 --- a/converter/other/jpeg2000/Makefile +++ b/converter/other/jpeg2000/Makefile @@ -60,8 +60,9 @@ include $(SRCDIR)/Makefile.common LIBOPTS = $(shell $(LIBOPT) $(NETPBMLIB) $(JASPERLIB_USE)) $(BINARIES): %: %.o $(JASPERLIB_DEP) $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) $(MATHLIB) $(LDLIBS) -o $@ $< \ - $(LIBOPTS) $(JASPERDEPLIBS) -lm $(RPATH) $(LADD) + $(LD) -o $@ $< \ + $(LIBOPTS) $(JASPERDEPLIBS) $(MATHLIB) $(RPATH) \ + $(LDFLAGS) $(LDLIBS) $(LADD) $(INTERNAL_JASPERLIB): $(BUILDDIR)/$(SUBDIR)/libjasper FORCE $(MAKE) -f $(SRCDIR)/$(SUBDIR)/libjasper/Makefile \ diff --git a/converter/other/jpeg2000/libjasper/Makefile.common b/converter/other/jpeg2000/libjasper/Makefile.common index 56bcea0d..525e9c2d 100644 --- a/converter/other/jpeg2000/libjasper/Makefile.common +++ b/converter/other/jpeg2000/libjasper/Makefile.common @@ -26,7 +26,7 @@ include $(SRCDIR)/Makefile.common 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) $< + $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(CADD) $< $(LIB_OBJECTS): importinc |