diff options
| -rw-r--r-- | converter/other/jpeg2000/libjasper/common.mk | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/converter/other/jpeg2000/libjasper/common.mk b/converter/other/jpeg2000/libjasper/common.mk index 1911adba..687a9f3f 100644 --- a/converter/other/jpeg2000/libjasper/common.mk +++ b/converter/other/jpeg2000/libjasper/common.mk @@ -25,7 +25,7 @@ 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 $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(DEFS) $(CADD) $< + $(CC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(CADD) $< $(LIB_OBJECTS): importinc diff --git a/doc/HISTORY b/doc/HISTORY index 189213cc..6c9e00fb 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -19,6 +19,10 @@ not yet BJH Release 10.45.00 pamditherbw: Fix -value other than .5 with -fs, -atkinson. + Build: Move CFLAGS later in libjasper build so that a -I in + CFLAGS doesn't interfere with finding the local libjasper + header files. + Build: Move LDFLAGS later so that a -L in LDFLAGS doesn't interfere with finding the built libnetpbm. (The common link rule is already this way in 10.44.00; all the other |