diff options
Diffstat (limited to 'graphics/GMT/patches/patch-ao')
| -rw-r--r-- | graphics/GMT/patches/patch-ao | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/graphics/GMT/patches/patch-ao b/graphics/GMT/patches/patch-ao index a1bb3a5fcc9..444b83d45f6 100644 --- a/graphics/GMT/patches/patch-ao +++ b/graphics/GMT/patches/patch-ao @@ -1,35 +1,36 @@ -$NetBSD: patch-ao,v 1.1 2001/01/27 08:16:01 jtb Exp $ +$NetBSD: patch-ao,v 1.2 2001/04/19 20:51:32 jtb Exp $ ---- src/imgsrc/makefile.orig Sat Jan 27 03:13:35 2001 -+++ src/imgsrc/makefile -@@ -7,24 +7,24 @@ +--- ./src/imgsrc/makefile.orig Wed Apr 11 19:58:09 2001 ++++ ./src/imgsrc/makefile +@@ -6,25 +6,25 @@ + include ../makegmt.macros - CDF = -L$(NETCDF)/lib -lnetcdf --GMT = -L.. -lgmt -lpsl +-CDF = -L$(NETCDF)/lib -lnetcdf +-GMT = -L.. -L$(libdir) -lgmt -lpsl ++CDF = -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf +GMT = ../libgmt.la ../libpsl.la - CFLAGS = $(CC_OPT) $(WIN32) -I.. -I$(NETCDF)/include + CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include all: img2mercgrd install: all - $(INSTALL) img2mercgrd$(EXE) $(bindir) - $(INSTALL) img2grd $(bindir) -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) img2mercgrd$(EXE) $(bindir) -+ $(INSTALL_SCRIPT) img2grd $(bindir) ++ @$(LIBTOOL) $(INSTALL_PROGRAM) img2mercgrd$(EXE) $(bindir) ++ @$(LIBTOOL) $(INSTALL_SCRIPT) img2grd $(bindir) uninstall: \rm -f $(bindir)/img2mercgrd$(EXE) $(bindir)/img2grd img2mercgrd: img2mercgrd.o gmt_imgsubs.o - $(CC) $(CFLAGS) $(LDFLAGS) img2mercgrd.o gmt_imgsubs.o $(GMT) $(CDF) $(LIBS) -o img2mercgrd -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) img2mercgrd.lo gmt_imgsubs.lo $(GMT) $(CDF) $(LIBS) -o img2mercgrd ++ @$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) img2mercgrd.lo gmt_imgsubs.lo $(GMT) $(CDF) $(LIBS) -o img2mercgrd spotless: clean clean: -- rm -f *.o img2mercgrd$(EXE) -+ rm -fr *.o *.lo .libs img2mercgrd$(EXE) + rm -f *.o img2mercgrd$(EXE) .c.o: - $(CC) -c $(CFLAGS) $< -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $< |