diff options
Diffstat (limited to 'graphics/GMT/patches/patch-ap')
| -rw-r--r-- | graphics/GMT/patches/patch-ap | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/graphics/GMT/patches/patch-ap b/graphics/GMT/patches/patch-ap index 5e448ef71b6..30231d4d931 100644 --- a/graphics/GMT/patches/patch-ap +++ b/graphics/GMT/patches/patch-ap @@ -1,20 +1,22 @@ -$NetBSD: patch-ap,v 1.3 2005/06/22 08:34:54 jlam Exp $ +$NetBSD: patch-ap,v 1.4 2006/11/14 13:16:00 wennmach Exp $ ---- ./src/meca/makefile.orig Wed Apr 11 19:58:09 2001 -+++ ./src/meca/makefile -@@ -9,9 +9,9 @@ +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) -lpsl -lgmt $(CDF) $(LIBS) $(LDFLAGS) -+ALLLIB = ../libpsl.la ../libgmt.la $(CDF) $(LIBS) $(LDFLAGS) +-ALLLIB = -L.. -L$(libdir) -lgmt -lgmtps -lpsl $(CDF) $(LIBS) $(LDFLAGS) ++ALLLIB = ../libgmt.la ../libgmtps.la ../libpsl.la $(CDF) $(LIBS) $(LDFLAGS) # # -@@ -23,7 +23,7 @@ +@@ -25,7 +25,7 @@ install: all for i in $(MECA); do \ @@ -23,26 +25,31 @@ $NetBSD: patch-ap,v 1.3 2005/06/22 08:34:54 jlam Exp $ done uninstall: -@@ -34,19 +34,19 @@ +@@ -35,20 +35,20 @@ + spotless: clean - psmeca: psmeca.o utilmeca.o nrutil.o +-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 +-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 +-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 +-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: + .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) $< |