You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
cfitsio/cfitsio-zlib.patch

41 lines
1.8 KiB

diff -ur cfitsio/Makefile.in cfitsio.no-zlib/Makefile.in
--- cfitsio/Makefile.in 2013-12-05 23:20:57.000000000 +0100
+++ cfitsio.no-zlib/Makefile.in 2013-12-09 11:05:55.332013282 +0100
@@ -62,9 +62,7 @@
swapproc.c wcssub.c wcsutil.c imcompress.c quantize.c ricecomp.c \
pliocomp.c fits_hcompress.c fits_hdecompress.c
-ZLIB_SOURCES = zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c \
- zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \
- zlib/uncompr.c zlib/zcompress.c zlib/zuncompress.c zlib/zutil.c
+ZLIB_SOURCES = zlib/zcompress.c zlib/zuncompress.c
SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
@@ -97,7 +95,7 @@
shared: libcfitsio${SHLIB_SUFFIX}
libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS}
+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz ${LIBS}
@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
@@ -118,13 +116,13 @@
${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm
testprog: testprog.o libcfitsio.a ${OBJECTS}
- ${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lm ${LIBS}
+ ${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lz -lm ${LIBS}
fpack: fpack.o fpackutil.o libcfitsio.a ${OBJECTS}
- ${CC} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o libcfitsio.a -lm ${LIBS}
+ ${CC} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o -L. -lcfitsio -lz -lm ${LIBS}
funpack: funpack.o fpackutil.o libcfitsio.a ${OBJECTS}
- ${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o libcfitsio.a -lm ${LIBS}
+ ${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o -L. -lcfitsio -lz -lm ${LIBS}
fitscopy: fitscopy.o libcfitsio.a ${OBJECTS}
${CC} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm ${LIBS}