HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| 4b12fe5c TD |
1 | Remove dependencies on bundled zlib, pcre and expat. |
| 2 | ||
| 3 | diff --git a/Makefile.in b/Makefile.in | |
| 4 | index 4360a26..80f9f59 100644 | |
| 5 | --- a/Makefile.in | |
| 6 | +++ b/Makefile.in | |
| 7 | @@ -210,8 +210,7 @@ coda_matlab_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ | |
| 8 | @BUILD_MATLAB_TRUE@@SUBPACKAGE_MODE_FALSE@ -rpath \ | |
| 9 | @BUILD_MATLAB_TRUE@@SUBPACKAGE_MODE_FALSE@ $(matlabmexexecdir) | |
| 10 | am__DEPENDENCIES_1 = | |
| 11 | -libcoda_la_DEPENDENCIES = @LTLIBOBJS@ libexpat_internal.la \ | |
| 12 | - libpcre_internal.la libz_internal.la $(am__DEPENDENCIES_1) \ | |
| 13 | +libcoda_la_DEPENDENCIES = @LTLIBOBJS@ $(am__DEPENDENCIES_1) \ | |
| 14 | $(am__DEPENDENCIES_1) | |
| 15 | am__libcoda_la_SOURCES_DIST = libcoda/coda-ascbin-cursor.c \ | |
| 16 | libcoda/coda-ascbin.h libcoda/coda-ascii-cursor.c \ | |
| 17 | @@ -306,8 +305,7 @@ libcoda_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | |
| 18 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | |
| 19 | $(libcoda_la_LDFLAGS) $(LDFLAGS) -o $@ | |
| 20 | @SUBPACKAGE_MODE_FALSE@am_libcoda_la_rpath = -rpath $(libdir) | |
| 21 | -am__DEPENDENCIES_2 = @LTLIBOBJS@ libexpat_internal.la \ | |
| 22 | - libpcre_internal.la libz_internal.la $(am__DEPENDENCIES_1) \ | |
| 23 | +am__DEPENDENCIES_2 = @LTLIBOBJS@ $(am__DEPENDENCIES_1) \ | |
| 24 | $(am__DEPENDENCIES_1) | |
| 25 | libcoda_internal_la_DEPENDENCIES = $(am__DEPENDENCIES_2) | |
| 26 | am__libcoda_internal_la_SOURCES_DIST = libcoda/coda-ascbin-cursor.c \ | |
| 27 | @@ -898,8 +896,8 @@ INSTALL_DATA_HOOK_TARGETS = $(am__append_1) | |
| 28 | UNINSTALL_HOOK_TARGETS = | |
| 29 | CLEAN_LOCAL_TARGETS = $(am__append_11) | |
| 30 | ALL_LOCAL_TARGETS = | |
| 31 | -@SUBPACKAGE_MODE_FALSE@noinst_LTLIBRARIES = libcoda_internal.la libexpat_internal.la libpcre_internal.la libz_internal.la | |
| 32 | -@SUBPACKAGE_MODE_TRUE@noinst_LTLIBRARIES = libcoda_internal.la libexpat_internal.la libpcre_internal.la libz_internal.la | |
| 33 | +@SUBPACKAGE_MODE_FALSE@noinst_LTLIBRARIES = libcoda_internal.la | |
| 34 | +@SUBPACKAGE_MODE_TRUE@noinst_LTLIBRARIES = libcoda_internal.la | |
| 35 | ||
| 36 | # libraries (+ related files) | |
| 37 | @SUBPACKAGE_MODE_FALSE@lib_LTLIBRARIES = libcoda.la | |
| 38 | @@ -1048,7 +1046,7 @@ libcoda_hdf5_files = \ | |
| 39 | ||
| 40 | libcoda_la_CPPFLAGS = -Ilibcoda/expat -I$(srcdir)/libcoda/expat -Ilibcoda/pcre -I$(srcdir)/libcoda/pcre -Ilibcoda/zlib -I$(srcdir)/libcoda/zlib $(AM_CPPFLAGS) | |
| 41 | libcoda_la_LDFLAGS = -no-undefined -version-info $(LIBCODA_CURRENT):$(LIBCODA_REVISION):$(LIBCODA_AGE) | |
| 42 | -libcoda_la_LIBADD = @LTLIBOBJS@ libexpat_internal.la libpcre_internal.la libz_internal.la $(HDF4LIBS) $(HDF5LIBS) | |
| 43 | +libcoda_la_LIBADD = @LTLIBOBJS@ $(HDF4LIBS) $(HDF5LIBS) | |
| 44 | libcoda_internal_la_SOURCES = libcoda/coda-ascbin-cursor.c \ | |
| 45 | libcoda/coda-ascbin.h libcoda/coda-ascii-cursor.c \ | |
| 46 | libcoda/coda-ascii-internal.h libcoda/coda-ascii.c \ |