1acbced92d
GMT help script. Fix some patch fuzz. Install libgmt_mgg.la before the programs depending on it, saving some warnings from libtool.
32 lines
891 B
Text
32 lines
891 B
Text
$NetBSD: patch-aq,v 1.3 2001/04/20 17:16:19 jtb Exp $
|
|
|
|
--- src/misc/makefile.orig Wed Apr 11 19:58:09 2001
|
|
+++ src/misc/makefile
|
|
@@ -6,7 +6,7 @@
|
|
|
|
include ../makegmt.macros
|
|
|
|
-CDF = -L$(NETCDF)/lib -lnetcdf
|
|
+CDF = -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf
|
|
|
|
CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include
|
|
|
|
@@ -30,7 +30,7 @@
|
|
|
|
install: all
|
|
for i in $(MISC); do \
|
|
- $(INSTALL) $$i$(EXE) $(bindir); \
|
|
+ $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
|
|
done
|
|
|
|
uninstall:
|
|
@@ -51,7 +51,7 @@
|
|
#-------------------------------------------------------------------------------
|
|
|
|
$(MISC): $(MISC_O)
|
|
- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L.. -L$(libdir) -lpsl -lgmt $(CDF) $(LIBS) -o $@
|
|
+ @$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) $@.lo ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@
|
|
|
|
.c.o:
|
|
- $(CC) -c $(CFLAGS) $<
|
|
+ @$(LIBTOOL) $(CPPFLAGS) $(CC) -c $(CFLAGS) $<
|