diff options
Diffstat (limited to 'graphics/GMT/patches/patch-ar')
| -rw-r--r-- | graphics/GMT/patches/patch-ar | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/graphics/GMT/patches/patch-ar b/graphics/GMT/patches/patch-ar index 7e1b6a6654f..6a57b0d5b62 100644 --- a/graphics/GMT/patches/patch-ar +++ b/graphics/GMT/patches/patch-ar @@ -1,13 +1,13 @@ -$NetBSD: patch-ar,v 1.1 2001/01/27 08:16:02 jtb Exp $ +$NetBSD: patch-ar,v 1.2 2001/04/19 20:51:32 jtb Exp $ ---- src/segyprogs/makefile.orig Sat Jan 27 03:25:15 2001 -+++ src/segyprogs/makefile +--- ./src/segyprogs/makefile.orig Wed Apr 11 19:58:09 2001 ++++ ./src/segyprogs/makefile @@ -8,7 +8,7 @@ #------------------------- stop here -------------------------- - CFLAGS = $(CC_OPT) $(WIN32) -I.. -I$(NETCDF)/include -I$(GMT_DEFAULT_PATH)/src --ALLLIB = -L.. -L$(GMT_DEFAULT_PATH)/bin -lgmt -lpsl -L$(NETCDF)/lib -lnetcdf $(LIBS) -+ALLLIB = ../libgmt.la ../libpsl.la -L$(NETCDF)/lib -lnetcdf $(LIBS) + CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include -I$(GMT_DEFAULT_PATH)/src +-ALLLIB = -L.. -L$(libdir) -lgmt -lpsl -L$(NETCDF)/lib -lnetcdf $(LIBS) ++ALLLIB = ../libgmt.la ../libpsl.la -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf $(LIBS) SEGYPLOT_H = segy_io.h segy.h segyreel.h SEGYPLOT_C = pssegyz.c pssegy.c @@ -16,28 +16,21 @@ $NetBSD: patch-ar,v 1.1 2001/01/27 08:16:02 jtb Exp $ install: all for i in $(SEGYPLOT); do \ - $(INSTALL) $$i$(EXE) $(bindir); \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ ++ $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ done uninstall: -@@ -32,16 +32,16 @@ - done - - clean: -- \rm -f *.o -+ \rm -f *.o *.lo - for i in $(SEGYPLOT); do \ - \rm -f $$i$(EXE); \ - done +@@ -41,10 +41,10 @@ + \rm -f *.a - spotless: clean -- \rm -f *.a -+ \rm -fr .libs *.la + segy_io.o: $(SEGYPLOT_H) segy_io.c +- $(CC) -c $(CFLAGS) segy_io.c ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) segy_io.c $(SEGYPLOT): $(SEGYPLOT_O) segy_io.o - $(CC) $(CFLAGS) segy_io.o $@.o -o $@ $(ALLLIB) $(LDFLAGS) -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) segy_io.lo $@.lo -o $@ $(ALLLIB) $(LDFLAGS) ++ @$(LIBTOOL) $(CC) $(CFLAGS) segy_io.lo $@.lo -o $@ $(ALLLIB) $(LDFLAGS) .c.o: - $(CC) -c $(CFLAGS) $< -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $< |