11f5afe35b
The most significant changes in 4.0 include: o Time-series support o New Tools: - gmt2rgb - grdblend - pslegend: o 30 new program options o More than 23 general enhancements The releases 4.1 and 4.1.1 to 4.1.4 include the following changes: o numerous significant bug fixes o many added program options o added features and capabilities For a complete list of changes, see http://gmt.soest.hawaii.edu/gmt/gmt_releases.html
57 lines
1.9 KiB
Text
57 lines
1.9 KiB
Text
$NetBSD: patch-ap,v 1.4 2006/11/14 13:16:00 wennmach Exp $
|
|
|
|
Libtoolize.
|
|
|
|
--- src/meca/makefile.orig Wed Apr 11 19:58:09 2001
|
|
+++ src/meca/makefile
|
|
@@ -11,9 +11,9 @@
|
|
|
|
NETCDFLIB = $(NETCDF)/lib
|
|
NETCDFINC = $(NETCDF)/include
|
|
-CDF = -L$(NETCDFLIB) -lnetcdf
|
|
+CDF = -Wl,-R$(NETCDFLIB) -L$(NETCDFLIB) -lnetcdf
|
|
CFLAGS = $(CC_OPT) -I$(srcdir) -I$(NETCDFINC)
|
|
-ALLLIB = -L.. -L$(libdir) -lgmt -lgmtps -lpsl $(CDF) $(LIBS) $(LDFLAGS)
|
|
+ALLLIB = ../libgmt.la ../libgmtps.la ../libpsl.la $(CDF) $(LIBS) $(LDFLAGS)
|
|
#
|
|
#
|
|
|
|
@@ -25,7 +25,7 @@
|
|
|
|
install: all
|
|
for i in $(MECA); do \
|
|
- $(INSTALL) $$i$(EXE) $(bindir); \
|
|
+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
|
|
done
|
|
|
|
uninstall:
|
|
@@ -35,20 +35,20 @@
|
|
|
|
spotless: clean
|
|
|
|
-psmeca: psmeca.o utilmeca.o nrutil.o $(GMTLIB)
|
|
- $(CC) $(CFLAGS) psmeca.o utilmeca.o nrutil.o $(ALLLIB) -o ./$@
|
|
+psmeca: psmeca.o utilmeca.o nrutil.o
|
|
+ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) psmeca.lo utilmeca.lo nrutil.lo $(ALLLIB) -o ./$@
|
|
|
|
-pscoupe: pscoupe.o utilmeca.o submeca.o distaz.o nrutil.o $(GMTLIB)
|
|
- $(CC) $(CFLAGS) pscoupe.o utilmeca.o submeca.o distaz.o nrutil.o $(ALLLIB) -o ./$@
|
|
+pscoupe: pscoupe.o utilmeca.o submeca.o distaz.o nrutil.o
|
|
+ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) pscoupe.lo utilmeca.lo submeca.lo distaz.lo nrutil.lo $(ALLLIB) -o ./$@
|
|
|
|
-pspolar: pspolar.o $(GMTLIB)
|
|
- $(CC) $(CFLAGS) pspolar.o $(ALLLIB) -o ./$@
|
|
+pspolar: pspolar.o
|
|
+ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) pspolar.lo $(ALLLIB) -o ./$@
|
|
|
|
-psvelo: psvelo.o utilvelo.o utilstrain.o $(GMTLIB)
|
|
- $(CC) $(CFLAGS) psvelo.o utilvelo.o utilstrain.o $(ALLLIB) -o ./$@
|
|
+psvelo: psvelo.o utilvelo.o utilstrain.o
|
|
+ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) psvelo.lo utilvelo.lo utilstrain.lo $(ALLLIB) -o ./$@
|
|
|
|
.c.o: $(GMT_H) $(PS_H) meca.h nrutil.h submeca.h utilmeca.h utilstrain.h utilvelo.h
|
|
- $(CC) -c $(CFLAGS) $<
|
|
+ @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
|
|
|
|
clean:
|
|
rm -f *.o
|