102 lines
3.9 KiB
Plaintext
102 lines
3.9 KiB
Plaintext
$NetBSD: patch-aa,v 1.6 2016/06/18 09:06:11 mef Exp $
|
|
|
|
Use libtool.
|
|
|
|
--- Makefile.in.orig 2016-04-02 04:06:28.000000000 +0900
|
|
+++ Makefile.in 2016-06-18 17:30:44.000000000 +0900
|
|
@@ -37,14 +37,15 @@ INSTALL_DIRS = @INSTALL_ROOT@ ${CFITSIO_
|
|
SHELL = /bin/sh
|
|
ARCHIVE = @ARCHIVE@
|
|
RANLIB = @RANLIB@
|
|
-CC = @CC@
|
|
+CC = ${LIBTOOL} --mode=compile @CC@
|
|
+LD = ${LIBTOOL} --mode=link @CC@
|
|
CFLAGS = @CFLAGS@
|
|
CPPFLAGS = @CPPFLAGS@
|
|
SSE_FLAGS = @SSE_FLAGS@
|
|
FC = @FC@
|
|
LDFLAGS = @LDFLAGS@
|
|
LDFLAGS_BIN = @LDFLAGS_BIN@
|
|
-DEFS = @DEFS@
|
|
+DEFS = @DEFS@ -Dunix
|
|
LIBS = @LIBS@
|
|
FLEX = flex
|
|
BISON = bison
|
|
@@ -94,11 +95,11 @@ all:
|
|
all-nofitsio:
|
|
${MAKE} stand_alone "FITSIO_SRC="
|
|
|
|
-stand_alone: lib${PACKAGE}.a
|
|
+stand_alone: lib${PACKAGE}.la
|
|
|
|
-lib${PACKAGE}.a: ${OBJECTS}
|
|
- ${ARCHIVE} $@ ${OBJECTS}; \
|
|
- ${RANLIB} $@;
|
|
+lib${PACKAGE}.la: ${OBJECTS}
|
|
+ ${ARCHIVE} $lib${PACKAGE}.la ${OBJECTS}; \
|
|
+ ${LIBTOOL} --mode=link @CC@ -o $@ ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 3:0
|
|
|
|
shared: lib${PACKAGE}${SHLIB_SUFFIX}
|
|
|
|
@@ -109,10 +110,10 @@ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
|
|
ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
|
|
fi
|
|
|
|
-install: lib${PACKAGE}.a ${INSTALL_DIRS}
|
|
- /bin/cp -a lib${PACKAGE}* ${CFITSIO_LIB}
|
|
- /bin/cp fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}
|
|
- /bin/cp cfitsio.pc ${CFITSIO_LIB}/pkgconfig
|
|
+install: lib${PACKAGE}.la ${INSTALL_DIRS}
|
|
+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcfitsio.la ${CFITSIO_LIB}
|
|
+ ${BSD_INSTALL_DATA} fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}/
|
|
+ ${BSD_INSTALL_DATA} cfitsio.pc ${CFITSIO_LIB}/pkgconfig
|
|
@for task in ${FPACK_UTILS} ${UTILS}; do \
|
|
if [ -f $$task ]; then \
|
|
if [ ! -d ${CFITSIO_BIN} ]; then mkdir -p ${CFITSIO_BIN}; fi; \
|
|
@@ -133,29 +134,29 @@ utils: ${FPACK_UTILS} ${UTILS}
|
|
swapproc.o: swapproc.c
|
|
${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
|
|
|
|
-smem: smem.o lib${PACKAGE}.a ${OBJECTS}
|
|
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
|
|
+smem: smem.o lib${PACKAGE}.la ${OBJECTS}
|
|
+ ${LD} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm
|
|
|
|
-testprog: testprog.o lib${PACKAGE}.a ${OBJECTS}
|
|
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
|
+testprog: testprog.o lib${PACKAGE}.la ${OBJECTS}
|
|
+ ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
|
|
|
-fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
|
|
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
|
|
+fpack: fpack.o fpackutil.o lib${PACKAGE}.la ${OBJECTS}
|
|
+ ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
|
|
|
|
-funpack: funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
|
|
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
|
|
+funpack: funpack.o fpackutil.o lib${PACKAGE}.la ${OBJECTS}
|
|
+ ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
|
|
|
|
-fitscopy: fitscopy.o lib${PACKAGE}.a ${OBJECTS}
|
|
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
|
+fitscopy: fitscopy.o lib${PACKAGE}.la ${OBJECTS}
|
|
+ ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
|
|
|
-speed: speed.o lib${PACKAGE}.a ${OBJECTS}
|
|
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
|
+speed: speed.o lib${PACKAGE}.la ${OBJECTS}
|
|
+ ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
|
|
|
-imcopy: imcopy.o lib${PACKAGE}.a ${OBJECTS}
|
|
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
|
+imcopy: imcopy.o lib${PACKAGE}.la ${OBJECTS}
|
|
+ ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
|
|
|
-cookbook: cookbook.o lib${PACKAGE}.a ${OBJECTS}
|
|
- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
|
+cookbook: cookbook.o lib${PACKAGE}.la ${OBJECTS}
|
|
+ ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
|
|
|
|
eval: # Rebuild eval_* files from flex/bison source
|
|
${FLEX} -t eval.l > eval_l.c1
|