diff options
Diffstat (limited to 'graphics/GMT/patches/patch-al')
| -rw-r--r-- | graphics/GMT/patches/patch-al | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/graphics/GMT/patches/patch-al b/graphics/GMT/patches/patch-al index 927b349680b..faf57fb7712 100644 --- a/graphics/GMT/patches/patch-al +++ b/graphics/GMT/patches/patch-al @@ -1,9 +1,11 @@ -$NetBSD: patch-al,v 1.4 2005/06/22 08:34:54 jlam Exp $ +$NetBSD: patch-al,v 1.5 2006/11/14 13:16:00 wennmach Exp $ + +Libtoolize. --- src/mgg/makefile.orig Wed Apr 11 19:58:09 2001 +++ src/mgg/makefile -@@ -22,7 +22,7 @@ - include ../makegmt.macros +@@ -24,7 +24,7 @@ + include ../gmtalldeps.macros CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I$(NETCDF)/include -CDF = -L$(NETCDF)/lib -lnetcdf @@ -11,30 +13,32 @@ $NetBSD: patch-al,v 1.4 2005/06/22 08:34:54 jlam Exp $ MGG_H = gmt_mgg.h -@@ -44,18 +44,15 @@ +@@ -54,19 +54,17 @@ #------------------------------------------------------------------------------- install: all -- for i in $(MGG); do \ +- for i in $(MGG) $(MGGPS); do \ - $(INSTALL) $$i$(EXE) $(bindir); \ - done if [ ! -d $(libdir) ]; then \ mkdir -p $(libdir); \ fi if [ ! $(libdir) = $(srcdir) ]; then \ + rm -f $(libdir)/libgmt_mgg.*; \ - $(INSTALL) -m 444 libgmt_mgg.a $(libdir); \ - if [ -f libgmt_mgg.$(SL) ]; then \ - $(INSTALL) -m 444 libgmt_mgg.$(SL) $(libdir); \ - fi; \ -+ $(LIBTOOL) --mode=install $(INSTALL_DATA) libgmt_mgg.la $(libdir); \ ++ $(LIBTOOL) --mode=install $(INSTALL_DATA) libgmt_mgg.la $(libdir); \ fi -+ for i in $(MGG); do \ ++ for i in $(MGG) $(MGGPS); do \ + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ + done ++ uninstall: - for i in $(MGG); do \ -@@ -82,8 +79,7 @@ + for i in $(MGG) $(MGGPS); do \ +@@ -93,8 +91,7 @@ #------------------------------------------------------------------------------- libgmt_mgg.a: gmt_mgg.o @@ -44,12 +48,20 @@ $NetBSD: patch-al,v 1.4 2005/06/22 08:34:54 jlam Exp $ gmt_mgg.o: $(MGG_H) -@@ -92,7 +88,7 @@ +@@ -102,11 +99,12 @@ + # program dependencies #------------------------------------------------------------------------------- - $(MGG): libgmt_mgg.a $(MGG_O) -- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lgmt_mgg -L.. -L$(libdir) -lpsl -lgmt $(CDF) $(LIBS) -o $@ +-$(MGG): libgmt_mgg.a $(MGG_O) $(GMTLIB) +- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lgmt_mgg -L.. -L$(libdir) -lgmt $(CDF) $(LIBS) -o $@ ++$(MGG): libgmt_mgg.a $(MGG_O) + @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.o libgmt_mgg.la ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@ ++ + +-$(MGGPS): libgmt_mgg.a $(MGGPS_O) $(GMTLIB) +- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lgmt_mgg -L.. -L$(libdir) -lgmt -lgmtps -lpsl $(CDF) $(LIBS) -o $@ ++$(MGGPS): libgmt_mgg.a $(MGGPS_O) ++ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.o libgmt_mgg.la ../libgmt.la ../libgmtps.la ../libpsl.la $(CDF) $(LIBS) -o $@ .c.o: - $(CC) -c $(CFLAGS) $< |