1 diff -ruN ParMGridGen-1.0_orig/MGridGen/IMlib/IMlib.h ParMGridGen-1.0/MGridGen/IMlib/IMlib.h
2 --- ParMGridGen-1.0_orig/MGridGen/IMlib/IMlib.h 2001-11-08 18:41:25.000000000 -0500
3 +++ ParMGridGen-1.0/MGridGen/IMlib/IMlib.h 2011-12-24 13:46:41.000000000 -0500
9 +#include <sys/malloc.h>
12 /*************************************************************************
13 diff -ruN ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile ParMGridGen-1.0/MGridGen/IMlib/Makefile
14 --- ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile 2001-12-04 17:46:56.000000000 -0500
15 +++ ParMGridGen-1.0/MGridGen/IMlib/Makefile 2011-12-24 13:24:17.000000000 -0500
18 $(CC) $(CFLAGS) -c $*.c
20 -./libIMlib.a: $(OBJS)
21 +libIMlib.$(LIBEXT): $(OBJS)
29 - rm -f *.o ; rm -f ./libIMlib.a
30 + rm -f *.o ; rm -f ./libIMlib.$(LIBEXT)
31 diff -ruN ParMGridGen-1.0_orig/MGridGen/Lib/Makefile ParMGridGen-1.0/MGridGen/Lib/Makefile
32 --- ParMGridGen-1.0_orig/MGridGen/Lib/Makefile 2001-12-04 18:01:00.000000000 -0500
33 +++ ParMGridGen-1.0/MGridGen/Lib/Makefile 2011-12-24 13:24:17.000000000 -0500
35 INCLUDES = -I./ -I$(IMLIBDIR) $(INCDIR)
36 CFLAGS = $(COPTIONS) $(OPTFLAGS) $(DEBUGFLAGS) $(INCLUDES)
38 -OBJS = coarsen.o kwayfm.o match.o merge.o mgridgen.o refine.o setup.o
39 +OBJS = aratio.o coarsen.o kwayfm.o match.o merge.o mgridgen.o refine.o setup.o
40 IOBJS = blas.o dfkeysort.o dkeysort.o file.o ifkeysort.o ifloatsort.o \
41 iintsort.o ikeysort.o memory.o sort.o util.o
42 IMOBJS = $(addprefix ../IMlib/, $(IOBJS))
45 $(CC) $(CFLAGS) -c $*.c
47 -../../libmgrid.a: $(OBJS) $(IMOBJS)
48 +libMGridGen.$(LIBEXT): $(OBJS) $(IMOBJS)
49 $(AR) $@ $(OBJS) $(IMOBJS)
56 - rm -f *.o ; rm -f ../../libmgrid.a
57 + rm -f *.o ; rm -f ./libMGridGen.$(LIBEXT)
58 diff -ruN ParMGridGen-1.0_orig/MGridGen/Lib/mgridgen.h ParMGridGen-1.0/MGridGen/Lib/mgridgen.h
59 --- ParMGridGen-1.0_orig/MGridGen/Lib/mgridgen.h 2001-11-08 18:41:25.000000000 -0500
60 +++ ParMGridGen-1.0/MGridGen/Lib/mgridgen.h 2011-12-24 13:48:18.000000000 -0500
66 +#include <sys/malloc.h>
70 diff -ruN ParMGridGen-1.0_orig/MGridGen/Programs/Makefile ParMGridGen-1.0/MGridGen/Programs/Makefile
71 --- ParMGridGen-1.0_orig/MGridGen/Programs/Makefile 2001-12-04 18:02:26.000000000 -0500
72 +++ ParMGridGen-1.0/MGridGen/Programs/Makefile 2011-12-24 13:24:17.000000000 -0500
74 include ../../Makefile.in
76 -MGRIDLIB = ../../libmgrid.a
77 +MGRIDLIB = ../Lib/libMGridGen.$(LIBEXT)
79 ifeq ($(ddmalloc),yes)
80 DEBUGFLAGS := $(DEBUGFLAGS) -DDMALLOC -DDEBUG
81 diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in
82 --- ParMGridGen-1.0_orig/Makefile.in 2001-12-05 01:30:33.000000000 +0100
83 +++ ParMGridGen-1.0/Makefile.in 2017-04-04 15:36:04.695980033 +0200
85 #--------------------------------------------------------------------------
90 # Which compiler to use
91 # CC is the compiler for the serial code
95 # What options to be used by the compiler
104 # Where to put the executable
108 # Additional libraries
109 DMALLOCDIR = /usr/local
112 # In which directories to look for any additional libraries
121 # What additional libraries to link the programs with (eg., -lmpi)
123 -PARLIBS = -lparmgrid -lmgrid -lmpi -lm
126 +LIBS = -lMGridGen -lm
127 +PARLIBS = -lparmgrid -lMGridGen -lmpi -lm
130 # What archiving to use
132 +AR = clang -dynamiclib -headerpad_max_install_names -undefined dynamic_lookup -shared -o
134 # What to use for indexing the archive
139 #--------------------------------------------------------------------------
141 diff -ruN ParMGridGen-1.0_orig/Makefile ParMGridGen-1.0/Makefile
142 --- ParMGridGen-1.0_orig/Makefile 2001-11-09 00:41:22.000000000 +0100
143 +++ ParMGridGen-1.0/Makefile 2017-04-04 14:51:04.033914737 +0200
156 (cd ParMGridGen ; make)
159 (cd MGridGen ; make clean)
160 (cd ParMGridGen ; make clean )
164 (cd MGridGen ; make realclean )
165 (cd ParMGridGen ; make realclean )