diff options
Diffstat (limited to 'graphics/GMT/patches/patch-at')
| -rw-r--r-- | graphics/GMT/patches/patch-at | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/graphics/GMT/patches/patch-at b/graphics/GMT/patches/patch-at index 3d39c2889c1..bed354ac275 100644 --- a/graphics/GMT/patches/patch-at +++ b/graphics/GMT/patches/patch-at @@ -1,51 +1,52 @@ -$NetBSD: patch-at,v 1.1 2001/01/27 08:16:02 jtb Exp $ +$NetBSD: patch-at,v 1.2 2001/04/19 20:51:33 jtb Exp $ ---- src/x2sys/makefile.orig Wed Oct 18 03:01:23 2000 +--- src/x2sys/makefile.orig Wed Apr 11 19:58:09 2001 +++ src/x2sys/makefile @@ -7,7 +7,7 @@ #------------------------- stop here -------------------------- - CFLAGS = $(CC_OPT) $(WIN32) -I.. -I../mgg -I$(NETCDF)/include --ALLLIB = -L.. -lgmt -L../mgg -lgmt_mgg -lpsl -L$(NETCDF)/lib -lnetcdf $(LIBS) -+ALLLIB = ../libgmt.la -L../mgg -lgmt_mgg ../libpsl.la -L$(NETCDF)/lib -lnetcdf $(LIBS) + CFLAGS = $(CC_OPT) $(WIN32) -I$(srcdir) -I../mgg -I$(NETCDF)/include +-ALLLIB = -L.. -L$(libdir) -lgmt -L../mgg -lgmt_mgg -lpsl -L$(NETCDF)/lib -lnetcdf $(LIBS) ++ALLLIB = ../libgmt.la ../mgg/libgmt_mgg.la ../libpsl.la -Wl,-R$(NETCDF)/lib -L$(NETCDF)/lib -lnetcdf $(LIBS) XSYSTEM_H = x2sys.h XSYSTEM_C = x2sys_datalist.c x2sys_cross.c -@@ -19,14 +19,13 @@ +@@ -18,24 +18,20 @@ + #--------------------------------------------------------------- - libx2sys.a: x2sys.o +-libx2sys.a: x2sys.o - $(AR) cvr libx2sys.a $? - $(RANLIB) libx2sys.a -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ x2sys.lo ++libx2sys.la: x2sys.o ++ $(LIBTOOL) $(CC) -o libx2sys.la x2sys.lo --version-info 0:0 -rpath $(libdir) all: $(XSYSTEM) libx2sys.a install: all for i in $(XSYSTEM); do \ - $(INSTALL) $$i$(EXE) $(bindir); \ -+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ ++ $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \ done + if [ ! -d $(libdir) ]; then \ + mkdir -p $(libdir); \ + fi + if [ ! $(libdir) = $(srcdir) ]; then \ +- $(INSTALL) -m 444 libx2sys.a $(libdir); \ +- if [ -f libx2sys.$(SL) ]; then \ +- $(INSTALL) -m 444 libx2sys.$(SL) $(libdir); \ +- fi; \ ++ $(LIBTOOL) $(INSTALL_DATA) libx2sys.la $(libdir); \ + fi uninstall: -@@ -35,16 +34,16 @@ - done - - clean: -- \rm -f *.o -+ \rm -f *.o *.lo - for i in $(XSYSTEM); do \ - \rm -f $$i$(EXE); \ - done - - spotless: clean -- \rm -f *.a -+ \rm -fr .libs *.la +@@ -59,7 +55,7 @@ + \rm -f *.a $(XSYSTEM): $(XSYSTEM_O) libx2sys.a - $(CC) $(CFLAGS) $@.o -o $@ -L. -lx2sys $(ALLLIB) $(LDFLAGS) -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $@.lo -o $@ -L. -lx2sys $(ALLLIB) $(LDFLAGS) ++ @$(LIBTOOL) $(CC) $(CFLAGS) $@.lo -o $@ -L. -lx2sys $(ALLLIB) $(LDFLAGS) .c.o: - $(CC) -c $(CFLAGS) $< -+ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< ++ @$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $< |