File interviews-18-use_system_tiff.patch of Package neuron-interviews
--- a/src/bin/iclass/Makefile.in +++ b/src/bin/iclass/Makefile.in @@ -53,7 +53,7 @@ INCLUDES = -I../../include/IV-2_6 -I../../include $(X_CFLAGS) -IVLIBS = ../../lib/libIVhines.la ../../lib/libUnidrawhines.la $(X_LIBS) +IVLIBS = ../../lib/libIVhines.la ../../lib/libUnidrawhines.la $(X_LIBS) -ltiff # # Lists of objects that go into the libraries: --- a/src/bin/idemo/Makefile.in +++ b/src/bin/idemo/Makefile.in @@ -53,7 +53,7 @@ INCLUDES = -I../../include $(X_CFLAGS) -@CARBON_FALSE@@CYGWIN_FALSE@@MINGW_FALSE@IVLIBS = ../../lib/libUnidrawhines.la ../../lib/libIVhines.la $(X_LIBS) +@CARBON_FALSE@@CYGWIN_FALSE@@MINGW_FALSE@IVLIBS = ../../lib/libUnidrawhines.la ../../lib/libIVhines.la $(X_LIBS) -ltiff @CYGWIN_FALSE@CYG = @CYGWIN_TRUE@IVLIBS = ../../lib/libIVhines.la @CYGWIN_TRUE@CYG = --- a/src/bin/idraw/Makefile.in +++ b/src/bin/idraw/Makefile.in @@ -53,7 +53,7 @@ INCLUDES = -I../../include/IV-2_6 -I../../include $(X_CFLAGS) -IVLIBS = ../../lib/libUnidrawhines.la ../../lib/libIVhines.la $(X_LIBS) +IVLIBS = ../../lib/libUnidrawhines.la ../../lib/libIVhines.la $(X_LIBS) -ltiff # # Lists of objects that go into the libraries: --- a/src/include/Makefile.in +++ b/src/include/Makefile.in @@ -32,7 +32,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@CARBON_FALSE@@CYGWIN_FALSE@@MINGW_FALSE@DIRS = Dispatch IV-2_6 IV-2_6/InterViews IV-X11 IV-look InterViews OS TIFF +@CARBON_FALSE@@CYGWIN_FALSE@@MINGW_FALSE@DIRS = Dispatch IV-2_6 IV-2_6/InterViews IV-X11 IV-look InterViews OS @CYGWIN_TRUE@DIRS = Dispatch IV-Win IV-look InterViews OS TIFF --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -58,7 +58,7 @@ @MINGW_TRUE@KIT_DEFINES = -Dmotif_kit -Dsgi_motif_kit @CARBON_TRUE@KIT_DEFINES = -Dmotif_kit -Dsgi_motif_kit -Dbw_kit -Ddefault_kit=SMFKit TIFF_DEFINES = -DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT -DHAVE_IEEEFP=1 -DUSE_VARARGS=0 -DUSE_PROTOTYPES=1 -DUSE_CONST=1 -TIFF_INCLUDES = -I../include/TIFF +TIFF_INCLUDES = -I$(includedir) # Rename the libraries to something unique so we don't accidently link with # a vanilla interviews distribution. @@ -295,7 +295,7 @@ IV-Mac/session.lo \ IV-Mac/window.lo -@CARBON_FALSE@@CYGWIN_FALSE@@MINGW_FALSE@libIV_la_OBJECTS = $(dispatch) $(iv26) $(ivx11) $(interviews) $(os) $(tiff) +@CARBON_FALSE@@CYGWIN_FALSE@@MINGW_FALSE@libIV_la_OBJECTS = $(dispatch) $(iv26) $(ivx11) $(interviews) $(os) @CYGWIN_TRUE@libIV_la_OBJECTS = $(dispatch) $(ivwin) $(interviews) $(os) $(tiff) @MINGW_TRUE@libIV_la_OBJECTS = $(ivwin) $(interviews) $(os) @CARBON_TRUE@libIV_la_OBJECTS = $(dispatch) $(ivmac) $(interviews) $(os)