FS-10074: [libtiff] stop using embedded libtiff. Build now requires system libtiff

diff --git a/src/mod/endpoints/mod_skypopen/Makefile.am b/src/mod/endpoints/mod_skypopen/Makefile.am
index b5d1b91e4bdddf2c6ba513c3f2377306c06f4d03..3e1c8ec7ef264fe36d68abaa1b1c243c355d77d7 100644 (file)
--- a/src/mod/endpoints/mod_skypopen/Makefile.am
+++ b/src/mod/endpoints/mod_skypopen/Makefile.am
@@ -1,10 +1,6 @@
 include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_skypopen
 
-TIFF_DIR=$(switch_srcdir)/libs/tiff-4.0.2
-TIFF_BUILDDIR=$(switch_builddir)/libs/tiff-4.0.2
-TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la
-
 SPANDSP_DIR=$(switch_srcdir)/libs/spandsp
 SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp
 SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la
@@ -12,16 +8,12 @@ SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la
 mod_LTLIBRARIES = mod_skypopen.la
 mod_skypopen_la_SOURCES  = mod_skypopen.c skypopen_protocol.c
 mod_skypopen_la_CFLAGS   = $(AM_CFLAGS)
-mod_skypopen_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -I.
-mod_skypopen_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA) $(TIFF_LA)
+mod_skypopen_la_CPPFLAGS = -I$(SPANDSP_DIR)/src -I$(SPANDSP_BUILDDIR)/src -I.
+mod_skypopen_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SPANDSP_LA)
 mod_skypopen_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lX11
 
-BUILT_SOURCES = $(TIFF_LA) $(SPANDSP_LA)
-
-$(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
-       cd $(SPANDSP_BUILDDIR) && $(MAKE) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -I$(TIFF_BUILDDIR)/libtiff -I$(TIFF_DIR)/libtiff"
-       $(TOUCH_TARGET)
+BUILT_SOURCES = $(SPANDSP_LA)
 
-$(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update
-       cd $(TIFF_BUILDDIR) && $(MAKE)
+$(SPANDSP_LA): $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
+       cd $(SPANDSP_BUILDDIR) && $(MAKE) CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)"
        $(TOUCH_TARGET)