9a51b0a289
change, remove some unnecessary changes to the configure script and makefiles that caused @NETCDF@ to be substituted since the existing mechanism (simply set NETCDFHOME in the environment) is more than sufficient. * Remove some unnecessary changes to the configure script and makefiles to cause @LIBTOOL@ to be substituted. We can simply pass in the right value via MAKE_ENV instead of hardcoding the value. * Fix a place where we weren't calling the compiler correctly, which broke the build of certain programs that should be installed and which were already listed in the PLIST. * Add --mode=MODE tags in the appropriate places to suppress the warnings from libtool that were cluttering the build log. Commit approved during the deep freeze by <agc>.
32 lines
1,006 B
Text
32 lines
1,006 B
Text
$NetBSD: patch-as,v 1.3 2005/06/22 08:34:54 jlam Exp $
|
|
|
|
--- ./src/spotter/makefile.orig Wed Apr 11 19:58:09 2001
|
|
+++ ./src/spotter/makefile
|
|
@@ -19,7 +19,7 @@
|
|
include ../makegmt.macros
|
|
|
|
CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include
|
|
-CDF = -L$(NETCDF)/lib -lnetcdf
|
|
+CDF = -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf
|
|
|
|
SPOT_H = spotter.h
|
|
|
|
@@ -41,7 +41,7 @@
|
|
|
|
install: all
|
|
for i in $(SPOT); do \
|
|
- $(INSTALL) $$i$(EXE) $(bindir); \
|
|
+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
|
|
done
|
|
|
|
uninstall:
|
|
@@ -73,7 +73,7 @@
|
|
#-------------------------------------------------------------------------------
|
|
|
|
$(SPOT): libspotter.a $(SPOT_O)
|
|
- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lspotter -L.. -L$(libdir) -lpsl -lgmt $(CDF) $(LIBS) -o $@
|
|
+ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo -L. -lspotter -L.. ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@
|
|
|
|
.c.o:
|
|
- $(CC) -c $(CFLAGS) $<
|
|
+ @$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
|