c1caa32a12
Both of them installed libpsl library, meaning only one of them could be installed at one time. Changed the GMT libpsl library name to libgmtpsl. Changing GMT library was more appropriate as only iGMT depends on GMT and it does not use libraries.
36 lines
1.1 KiB
Text
36 lines
1.1 KiB
Text
$NetBSD: patch-ak,v 1.7 2019/11/08 03:09:22 kivinen Exp $
|
|
|
|
Libtoolize.
|
|
|
|
--- src/dbase/makefile.orig 2006-11-08 17:00:45.000000000 +0100
|
|
+++ src/dbase/makefile 2006-11-08 17:03:35.000000000 +0100
|
|
@@ -10,19 +10,19 @@
|
|
GMTSRCDIR = ..
|
|
include ../gmtalldeps.macros
|
|
|
|
-CDF = -L$(NETCDF)/lib -lnetcdf
|
|
+CDF = -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf
|
|
CFLAGS = $(CC_OPT) $(WIN32) $(SWAP) -I$(srcdir) -I$(NETCDF)/include
|
|
|
|
all: grdraster
|
|
|
|
install: all
|
|
- $(INSTALL) grdraster$(EXE) $(bindir)
|
|
+ @$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) grdraster$(EXE) $(bindir)
|
|
|
|
uninstall:
|
|
\rm -f $(bindir)/grdraster$(EXE)
|
|
|
|
-grdraster: grdraster.o $(GMTLIB)
|
|
- $(CC) $(CFLAGS) $(LDFLAGS) grdraster.o -L.. -L$(libdir) -lgmt $(CDF) $(LIBS) -o grdraster
|
|
+grdraster: grdraster.o
|
|
+ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) grdraster.lo -L$(PLAIN_LIBDIR) ../libgmt.la ../libgmtpsl.la $(CDF) $(LIBS) -o grdraster
|
|
|
|
spotless: clean
|
|
|
|
@@ -30,4 +30,4 @@
|
|
rm -f *.o grdraster$(EXE)
|
|
|
|
.c.o: $(GMT_H)
|
|
- $(CC) -c $(CFLAGS) $<
|
|
+ @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
|