From 754b74e25add27a8798c898f7301e2a5c7456f91 Mon Sep 17 00:00:00 2001 From: Robert Winkler Date: Tue, 12 Jul 2016 17:10:56 -0700 Subject: [PATCH] Cut compile time by compiling only what's needed Changed what gets compiled in tiff and libpng so we no longer build all the tools and misc executables/tests --- iomedley/Makefile.in | 5 +++-- iomedley/configure | 2 +- iomedley/configure.ac | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/iomedley/Makefile.in b/iomedley/Makefile.in index 563c4a62..12b7580d 100644 --- a/iomedley/Makefile.in +++ b/iomedley/Makefile.in @@ -72,10 +72,11 @@ $(LIBGIF): cd $(LIBGIFDIR) && $(MAKE) $(LIBTIFF): - cd $(LIBTIFFDIR) && $(MAKE) + cd $(LIBTIFFDIR)/port && $(MAKE) + cd $(LIBTIFFDIR)/libtiff && $(MAKE) $(LIBPNG): - cd $(LIBPNGDIR) && $(MAKE) + cd $(LIBPNGDIR) && $(MAKE) $(LIBPNG) $(LIBJPEG): cd $(LIBJPEGDIR) && $(MAKE) $(LIBJPEG) diff --git a/iomedley/configure b/iomedley/configure index 146e25bc..15bbeaa6 100755 --- a/iomedley/configure +++ b/iomedley/configure @@ -4489,7 +4489,7 @@ $as_echo "#define HAVE_LIBZ 1" >>confdefs.h $as_echo "#define HAVE_LIBPNG 1" >>confdefs.h - libpng="libpng16.a" + libpng="libpng16.la" libpngdir="libpng-1.6.23" save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" save_LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS -I$libpngdir" LIBS="$LIBS -lpng16" LDFLAGS="$LDFLAGS -L$libpngdir/.libs" diff --git a/iomedley/configure.ac b/iomedley/configure.ac index 5bd3132a..677cd09a 100644 --- a/iomedley/configure.ac +++ b/iomedley/configure.ac @@ -60,7 +60,7 @@ dnl Warn the user if zlib not found if test "$found_libz" = "yes"; then AC_DEFINE(HAVE_LIBZ, 1, [ define to 1 if you have libz ] ) AC_DEFINE(HAVE_LIBPNG, 1, [ define to 1 if you have libpng ] ) - libpng="libpng16.a" + libpng="libpng16.la" libpngdir="libpng-1.6.23" save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" save_LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS -I$libpngdir" LIBS="$LIBS -lpng16" LDFLAGS="$LDFLAGS -L$libpngdir/.libs"