|
|
|
|
diff -ur cfitsio/Makefile.in cfitsio.zlib/Makefile.in
|
|
|
|
|
--- cfitsio/Makefile.in 2014-06-03 20:51:29.000000000 +0200
|
|
|
|
|
+++ cfitsio.zlib/Makefile.in 2014-06-12 16:29:17.480249747 +0200
|
|
|
|
|
@@ -63,9 +63,7 @@
|
|
|
|
|
pliocomp.c fits_hcompress.c fits_hdecompress.c \
|
|
|
|
|
simplerng.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@
|
|
|
|
|
|
|
|
|
|
@@ -98,7 +96,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} $@; \
|
|
|
|
|
@@ -116,31 +114,31 @@
|
|
|
|
|
$(CC) -c $(CFLAGS) $(SSE_FLAGS) $(DEFS) $<
|
|
|
|
|
|
|
|
|
|
smem: smem.o libcfitsio.a ${OBJECTS}
|
|
|
|
|
- ${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm
|
|
|
|
|
+ ${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm -lz
|
|
|
|
|
|
|
|
|
|
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 -lm -lz ${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 libcfitsio.a -lm -lz ${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 libcfitsio.a -lm -lz ${LIBS}
|
|
|
|
|
|
|
|
|
|
fitscopy: fitscopy.o libcfitsio.a ${OBJECTS}
|
|
|
|
|
- ${CC} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm ${LIBS}
|
|
|
|
|
+ ${CC} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm -lz ${LIBS}
|
|
|
|
|
|
|
|
|
|
speed: speed.o libcfitsio.a ${OBJECTS}
|
|
|
|
|
- ${CC} $(CFLAGS) $(DEFS) -o speed speed.o -L. -lcfitsio -lm ${LIBS}
|
|
|
|
|
+ ${CC} $(CFLAGS) $(DEFS) -o speed speed.o -L. -lcfitsio -lm -lz ${LIBS}
|
|
|
|
|
|
|
|
|
|
imcopy: imcopy.o libcfitsio.a ${OBJECTS}
|
|
|
|
|
- ${CC} $(CFLAGS) $(DEFS) -o imcopy imcopy.o -L. -lcfitsio -lm ${LIBS}
|
|
|
|
|
+ ${CC} $(CFLAGS) $(DEFS) -o imcopy imcopy.o -L. -lcfitsio -lm -lz ${LIBS}
|
|
|
|
|
|
|
|
|
|
listhead: listhead.o libcfitsio.a ${OBJECTS}
|
|
|
|
|
- ${CC} $(CFLAGS) $(DEFS) -o listhead listhead.o -L. -lcfitsio -lm ${LIBS}
|
|
|
|
|
+ ${CC} $(CFLAGS) $(DEFS) -o listhead listhead.o -L. -lcfitsio -lm -lz ${LIBS}
|
|
|
|
|
|
|
|
|
|
cookbook: cookbook.o libcfitsio.a ${OBJECTS}
|
|
|
|
|
- ${CC} $(CFLAGS) $(DEFS) -o cookbook cookbook.o -L. -lcfitsio -lm ${LIBS}
|
|
|
|
|
+ ${CC} $(CFLAGS) $(DEFS) -o cookbook cookbook.o -L. -lcfitsio -lm -lz ${LIBS}
|
|
|
|
|
|
|
|
|
|
eval: # Rebuild eval_* files from flex/bison source
|
|
|
|
|
$(FLEX) -t eval.l > eval_l.c1
|
