diff -ruN ParMGridGen-1.0_orig/Makefile ParMGridGen-1.0/Makefile --- ParMGridGen-1.0_orig/Makefile 2017-04-04 15:02:44.020713666 +0200 +++ ParMGridGen-1.0/Makefile 2017-04-04 15:21:48.582647336 +0200 @@ -1,16 +1,21 @@ default: + (mkdir bin) (cd MGridGen ; make) serial: + (mkdir bin) (cd MGridGen ; make) parallel: + (mkdir bin) (cd MGridGen ; make) (cd ParMGridGen ; make) clean: + (mkdir bin) (cd MGridGen ; make clean) (cd ParMGridGen ; make clean ) realclean: + (mkdir bin) (cd MGridGen ; make realclean ) (cd ParMGridGen ; make realclean ) diff -ruN ParMGridGen-1.0_orig/Makefile.in ParMGridGen-1.0/Makefile.in --- ParMGridGen-1.0_orig/Makefile.in 2017-04-04 15:02:44.012713543 +0200 +++ ParMGridGen-1.0/Makefile.in 2017-04-04 15:06:00.159742074 +0200 @@ -1,6 +1,6 @@ #-------------------------------------------------------------------------- # Which make to use -make = gmake +make = make # Which compiler to use # CC is the compiler for the serial code @@ -12,7 +12,7 @@ OPTFLAGS = -O3 # What options to be used by the compiler -COPTIONS = +COPTIONS = -fPIC # Which loader to use LD = cc @@ -22,7 +22,7 @@ LDOPTIONS = -O3 # Where to put the executable -BINDIR = ../.. +BINDIR = ../../bin # Additional libraries DMALLOCDIR = /usr/local @@ -33,22 +33,25 @@ # In which directories to look for any additional libraries LIBDIR = -L../.. \ + -L../Lib \ -L/usr/lib32/ # Set some flags DEBUGFLAGS = # What additional libraries to link the programs with (eg., -lmpi) -LIBS = -lmgrid -lm -PARLIBS = -lparmgrid -lmgrid -lmpi -lm +LIBEXT = so + +LIBS = -Xlinker --add-needed -Xlinker --no-as-needed -lMGridGen -lm +PARLIBS = -Xlinker --add-needed -Xlinker --no-as-needed -lparmgrid -lMGridGen -lmpi -lm # What archiving to use -AR = ar rv +AR = gcc -shared -o # What to use for indexing the archive #RANLIB = ranlib -RANLIB = ar -ts +RANLIB = true #-------------------------------------------------------------------------- # diff -ruN ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile ParMGridGen-1.0/MGridGen/IMlib/Makefile --- ParMGridGen-1.0_orig/MGridGen/IMlib/Makefile 2001-12-04 14:46:56.000000000 -0800 +++ ParMGridGen-1.0/MGridGen/IMlib/Makefile 2013-08-22 20:03:32.925673296 -0700 @@ -33,7 +33,7 @@ .c.o: $(CC) $(CFLAGS) -c $*.c -./libIMlib.a: $(OBJS) +libIMlib.$(LIBEXT): $(OBJS) $(AR) $@ $(OBJS) $(RANLIB) $@ @@ -41,4 +41,4 @@ rm -f *.o realclean: - rm -f *.o ; rm -f ./libIMlib.a + rm -f *.o ; rm -f ./libIMlib.$(LIBEXT) diff -ruN ParMGridGen-1.0_orig/MGridGen/Lib/Makefile ParMGridGen-1.0/MGridGen/Lib/Makefile --- ParMGridGen-1.0_orig/MGridGen/Lib/Makefile 2001-12-04 15:01:00.000000000 -0800 +++ ParMGridGen-1.0/MGridGen/Lib/Makefile 2013-08-22 20:03:32.925673296 -0700 @@ -22,7 +22,7 @@ INCLUDES = -I./ -I$(IMLIBDIR) $(INCDIR) CFLAGS = $(COPTIONS) $(OPTFLAGS) $(DEBUGFLAGS) $(INCLUDES) -OBJS = coarsen.o kwayfm.o match.o merge.o mgridgen.o refine.o setup.o +OBJS = aratio.o coarsen.o kwayfm.o match.o merge.o mgridgen.o refine.o setup.o IOBJS = blas.o dfkeysort.o dkeysort.o file.o ifkeysort.o ifloatsort.o \ iintsort.o ikeysort.o memory.o sort.o util.o IMOBJS = $(addprefix ../IMlib/, $(IOBJS)) @@ -31,7 +31,7 @@ .c.o: $(CC) $(CFLAGS) -c $*.c -../../libmgrid.a: $(OBJS) $(IMOBJS) +libMGridGen.$(LIBEXT): $(OBJS) $(IMOBJS) $(AR) $@ $(OBJS) $(IMOBJS) $(RANLIB) $@ @@ -39,4 +39,4 @@ rm -f *.o realclean: - rm -f *.o ; rm -f ../../libmgrid.a + rm -f *.o ; rm -f ./libMGridGen.$(LIBEXT) diff -ruN ParMGridGen-1.0_orig/MGridGen/Programs/Makefile ParMGridGen-1.0/MGridGen/Programs/Makefile --- ParMGridGen-1.0_orig/MGridGen/Programs/Makefile 2001-12-04 15:02:26.000000000 -0800 +++ ParMGridGen-1.0/MGridGen/Programs/Makefile 2013-08-22 20:03:32.925673296 -0700 @@ -1,6 +1,6 @@ include ../../Makefile.in -MGRIDLIB = ../../libmgrid.a +MGRIDLIB = ../Lib/libMGridGen.$(LIBEXT) ifeq ($(ddmalloc),yes) DEBUGFLAGS := $(DEBUGFLAGS) -DDMALLOC -DDEBUG