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